From 79b626d9a26750b0cca0779e363b886c696945bd Mon Sep 17 00:00:00 2001 From: Tristan Date: Wed, 4 Jul 2018 20:14:51 -0500 Subject: [PATCH 01/26] rake rails:update --- bin/rails | 6 +- bin/rake | 4 - bin/setup | 29 + config/application.rb | 28 +- config/boot.rb | 3 +- config/environments/development.rb | 60 +- config/environments/production.rb | 106 +- config/environments/test.rb | 31 +- config/initializers/assets.rb | 11 + config/initializers/backtrace_silencers.rb | 6 +- config/initializers/cookies_serializer.rb | 2 +- config/initializers/inflections.rb | 24 +- config/initializers/mime_types.rb | 1 - config/initializers/session_store.rb | 9 +- config/initializers/wrap_parameters.rb | 12 +- config/locales/en.yml | 1501 +------------------- config/routes.rb | 285 +--- config/secrets.yml | 5 +- 18 files changed, 219 insertions(+), 1904 deletions(-) create mode 100755 bin/setup create mode 100644 config/initializers/assets.rb diff --git a/bin/rails b/bin/rails index b82341c9..5191e692 100755 --- a/bin/rails +++ b/bin/rails @@ -1,8 +1,4 @@ #!/usr/bin/env ruby -begin - load File.expand_path('../spring', __FILE__) -rescue LoadError -end -APP_PATH = File.expand_path('../../config/application', __FILE__) +APP_PATH = File.expand_path('../../config/application', __FILE__) require_relative '../config/boot' require 'rails/commands' diff --git a/bin/rake b/bin/rake index 2e9ece45..17240489 100755 --- a/bin/rake +++ b/bin/rake @@ -1,8 +1,4 @@ #!/usr/bin/env ruby -begin - load File.expand_path('../spring', __FILE__) -rescue LoadError -end require_relative '../config/boot' require 'rake' Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 00000000..acdb2c13 --- /dev/null +++ b/bin/setup @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +Dir.chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file: + + puts "== Installing dependencies ==" + system "gem install bundler --conservative" + system "bundle check || bundle install" + + # puts "\n== Copying sample files ==" + # unless File.exist?("config/database.yml") + # system "cp config/database.yml.sample config/database.yml" + # end + + puts "\n== Preparing database ==" + system "bin/rake db:setup" + + puts "\n== Removing old logs and tempfiles ==" + system "rm -f log/*" + system "rm -rf tmp/cache" + + puts "\n== Restarting application server ==" + system "touch tmp/restart.txt" +end diff --git a/config/application.rb b/config/application.rb index bad9f190..ab0edcbb 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,38 +1,26 @@ require File.expand_path('../boot', __FILE__) require 'rails/all' -require 'csv' # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) module Notebook - # Default application environment configurations class Application < Rails::Application - config.autoload_paths += Dir[Rails.root.join('app', 'models', '{*/}')] - config.autoload_paths += Dir[Rails.root.join('app', 'services', '{*/}')] + # 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. - # 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. - # + # 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. - # + # 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 - # Use delayed_job to process jobs - config.active_job.queue_adapter = :delayed_job - - # Filter sensitive parameters out of logs - config.filter_parameters << :password - config.filter_parameters << :password_confirmation - - # Don't encode ampersands into \u0026 when creating JSON - config.active_support.escape_html_entities_in_json = false + # Do not swallow errors in after_commit/after_rollback callbacks. + config.active_record.raise_in_transactional_callbacks = true end end diff --git a/config/boot.rb b/config/boot.rb index 5e5f0c1f..6b750f00 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,4 +1,3 @@ -# Set up gems listed in the Gemfile. ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/environments/development.rb b/config/environments/development.rb index bbc17194..b55e2144 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,55 +1,41 @@ -Notebook::Application.configure do - # Settings specified here will take precedence over those in config/application.rb +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 # since you don't have to restart the web server when you make code changes. config.cache_classes = false - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_controller.perform_caching = false + # Do not eager load code on boot. config.eager_load = false - # Don't care if the mailer can't send + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false - # Print deprecation notices to the Rails logger + # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log - # Only use best-standards-support built into browsers - config.action_dispatch.best_standards_support = :builtin + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load - # Do not compress assets - config.assets.compress = false - config.assets.compile = 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. config.assets.debug = true - config.assets.digest = false - # Devise default url options - config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } + # 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 - # DEVELOPMENT S3 settings for Paperclip uploads ON DEVELOPMENT - config.paperclip_defaults = { - storage: :s3, - s3_credentials: { - bucket: ENV.fetch('S3_BUCKET_NAME', 'notebook-content-uploads'), - s3_region: ENV.fetch('AWS_REGION', 'us-east-1'), - access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID', 'test'), - secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY', 'test') - } - } - - default_url_options[:host] = 'localhost:3000' - - # Set test-mode Stripe API key - Stripe.api_key = "sk_test_v37uWbseyPct6PpsfjTa3y1l" - config.stripe_publishable_key = 'pk_test_eXI4iyJ2gR9UOGJyJERvDlHF' - - # Uncomment to test error pages - # config.consider_all_requests_local = false + # 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 end diff --git a/config/environments/production.rb b/config/environments/production.rb index f0397fb0..5c1b32e4 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,101 +1,79 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - # Code is not reloaded between requests + # Code is not reloaded between requests. config.cache_classes = true - # Full error reports are disabled and caching is turned on - config.consider_all_requests_local = false - config.action_controller.perform_caching = true + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. config.eager_load = true - # Disable Rails's static asset server (Apache or nginx will already do this) - config.serve_static_files = true + # Full error reports are disabled and caching is turned on. + 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? # Compress JavaScripts and CSS. config.assets.js_compressor = :uglifier # config.assets.css_compressor = :sass - # Don't fallback to assets pipeline if a precompiled asset is missed - config.assets.compile = true + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false - # Generate digests for assets URLs + # 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 - # Version of your assets, change this if you want to expire all your assets. - config.assets.version = '1.0' + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb - # 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 + # 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 - # Force all access to the app over SSL, use Strict-Transport-Security, and - # use secure cookies. + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # config.force_ssl = true - # Set to :debug to see everything in the log. - config.log_level = :info + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug - # Prepend all log lines with the following tags + # Prepend all log lines with the following tags. # config.log_tags = [ :subdomain, :uuid ] - # Use a different logger for distributed setups + # Use a different logger for distributed setups. # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) - # Use a different cache store in production + # 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" + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' - # Precompile additional assets (application.js, application.css, and all non- - # JS/CSS are already added) - # config.assets.precompile += %w( search.js ) - - # Disable delivery errors, bad email addresses will be ignored - config.action_mailer.perform_deliveries = true - config.action_mailer.raise_delivery_errors = true - - # Enable threaded mode - # config.threadsafe! + # 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. + # config.action_mailer.raise_delivery_errors = false # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) + # the I18n.default_locale when a translation cannot be found). config.i18n.fallbacks = true - # Devise default url options - config.action_mailer.default_url_options = { host: 'www.notebook.ai', port: 80 } - ActionMailer::Base.smtp_settings = { - :address => "smtp.sendgrid.net", - :port => 587, - :authentication => :plain, - :user_name => ENV['SENDGRID_USERNAME'], - :password => ENV['SENDGRID_PASSWORD'], - :domain => ENV['SENDGRID_DOMAIN'], - :enable_starttls_auto => true - } - - # Send deprecation notices to registered listeners + # Send deprecation notices to registered listeners. config.active_support.deprecation = :notify - # S3 settings for Paperclip uploads - config.paperclip_defaults = { - storage: :s3, - s3_credentials: { - bucket: ENV.fetch('S3_BUCKET_NAME', 'notebook-content-uploads'), - s3_region: ENV.fetch('AWS_REGION', 'us-east-1'), - access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'), - secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY') - } - } + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new # Do not dump schema after migrations. - # TODO: double check this config.active_record.dump_schema_after_migration = false - - default_url_options[:host] = 'www.notebook.ai' - - # Set production Stripe API key - Stripe.api_key = ENV['STRIPE_API_KEY'] - config.stripe_publishable_key = ENV['STRIPE_PUBLISHABLE_KEY'] end diff --git a/config/environments/test.rb b/config/environments/test.rb index 4ba1b56f..1c19f08b 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -7,22 +7,23 @@ Rails.application.configure do # and recreated between test runs. Don't rely on the data there! config.cache_classes = true - # Configure static asset server for tests with Cache-Control for performance - config.serve_static_files = true - config.static_cache_control = 'public, max-age=3600' + # 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 + # preloads Rails for running tests, you may have to set it to true. config.eager_load = false - # Log error messages when you accidentally call methods on nil - config.whiny_nils = 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' - # Show full error reports and disable caching + # Show full error reports and disable caching. config.consider_all_requests_local = true config.action_controller.perform_caching = false - # Raise exceptions instead of rendering exception templates + # Raise exceptions instead of rendering exception templates. config.action_dispatch.show_exceptions = false - # Disable request forgery protection in test environment + # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false # Tell Action Mailer not to deliver emails to the real world. @@ -30,16 +31,12 @@ Rails.application.configure do # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test - # Print deprecation notices to the stderr - config.active_support.deprecation = :stderr - + # Randomize the order test cases are executed. config.active_support.test_order = :random - config.active_record.raise_in_transactional_callbacks = true + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr - default_url_options[:host] = 'test.host' - - # Set test-mode Stripe API key - Stripe.api_key = "We-don't-want-to-actually-hit-Stripe-from-tests" - config.stripe_publishable_key = 'pk_test_eXI4iyJ2gR9UOGJyJERvDlHF' + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 00000000..01ef3e66 --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,11 @@ +# Be sure to restart your server when you modify this file. + +# 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 +# Rails.application.config.assets.paths << Emoji.images_path + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. +# Rails.application.config.assets.precompile += %w( search.js ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb index cf74fe3d..59385cdf 100644 --- a/config/initializers/backtrace_silencers.rb +++ b/config/initializers/backtrace_silencers.rb @@ -1,9 +1,7 @@ # 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. +# 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/ } -# You can also remove all the silencers if you're trying to debug a problem -# that might stem from framework code. +# 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! diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb index 54516e3f..7f70458d 100644 --- a/config/initializers/cookies_serializer.rb +++ b/config/initializers/cookies_serializer.rb @@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file. -Rails.application.config.action_dispatch.cookies_serializer = :hybrid +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 5af97a69..ac033bf9 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -1,20 +1,16 @@ # Be sure to restart your server when you modify this file. -# Add new inflection rules using the following format -# (all these examples are active by default): -ActiveSupport::Inflector.inflections do |inflect| - #todo: Not sure how this interacts with translation files; might just be - # that we need pluralizations per-language that need them - #todo: Also, this doesn't seem to work since it also applies to the table name we look at (which is magics). - #inflect.plural /^(magic)$/i, 'types of \1' # Pluralize "magic" to "types of magic" +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end - # inflect.plural /^(ox)$/i, '\1en' - # inflect.singular /^(ox)en/i, '\1' - # inflect.irregular 'person', 'people' - # inflect.uncountable %w( fish sheep ) -end -# # These inflection rules are supported but not enabled by default: -# ActiveSupport::Inflector.inflections do |inflect| +# ActiveSupport::Inflector.inflections(:en) do |inflect| # inflect.acronym 'RESTful' # end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index 72aca7e4..dc189968 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -2,4 +2,3 @@ # Add new mime types for use in respond_to blocks: # Mime::Type.register "text/richtext", :rtf -# Mime::Type.register_alias "text/html", :iphone diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index f436fc76..a09e1d2b 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,10 +1,3 @@ # Be sure to restart your server when you modify this file. -Notebook::Application - .config.session_store :cookie_store, - key: '_plan_characters_session' - -# Use the database for sessions instead of the cookie-based default, -# which shouldn't be used to store highly confidential information -# (create the session table with "rails generate session_migration") -# Notebook::Application.config.session_store :active_record_store +Rails.application.config.session_store :cookie_store, key: '_notebook_session' diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb index 9c730834..33725e95 100644 --- a/config/initializers/wrap_parameters.rb +++ b/config/initializers/wrap_parameters.rb @@ -1,10 +1,14 @@ # Be sure to restart your server when you modify this file. -# + # This file contains settings for ActionController::ParamsWrapper which # is enabled by default. -# Enable parameter wrapping for JSON. You can disable this by setting :format -# to an empty array. +# 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] + wrap_parameters format: [:json] if respond_to?(:wrap_parameters) end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml index 1fe71509..06539571 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,1482 +1,23 @@ -# UTF-8 - -# Localization file for English. -# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale -# for starting points. +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. en: - no_view_permission: You don't have permission to view that! - no_do_permission: You don't have permission to do that! - must_be_logged_in: You must be logged-in to do that! - - username_password_incorrect: Username or password incorrect - login_successful: Login successful. - logged_out: Logged out! - - all_universes: All universes - - marketing: - landing_page: - promo_header: Your digital notebook is here. - promo_subheader: Notebook.ai grows with your ideas and collaborates back with you. - promo_subtext: Start worldbuilding now. No card needed. - - cta: - get_yours: Get Yours - writers: - header: For writers - body: Authors use Notebook.ai to create rich, immersive worlds to set their novels, stories, and plays in. - button: Learn more - roleplayers: - header: For roleplayers - body: Dungeon masters use Notebook.ai to build worlds for their campaigns that can be shared with players. - button: Learn more - designers: - header: For designers - body: Game design teams use Notebook.ai to collaborate and keep every aspect of their world in sync. - button: Learn more - - benefits: - creativity: - title: Promotes creativity - text: Your Notebook now asks you questions about your characters and ideas, and your answers are saved too. - - speed: - title: Speeds up writing - text: With a universe of information at your fingertips, you can look up anything quickly and keep writing. - - continuity: - title: Continuity checks - text: When every little fact is stored in one place, you can rest easy knowing you won't accidentally contradict yourself. - - characters: - title: Deeper characters - text: Get to know your characters. Track every detail of their thoughts, appearance, and personality. - - locations: - title: Richer worlds - text: Immerse yourself in vibrant worlds with tracking available for any kind of locations. - - items: - title: Legendary items - text: Every object has a backstory that can shine as bright as any character — if you let it. - - search: - title: Searchable - text: Quickly find anything, anywhere. Even that random thought you jotted down at 3am two years ago. - - organization: - title: Organizable - text: Focus on one universe at a time and filter everything else out. Reorganize, sort, and write freely. - - backups: - title: Backed up forever - text: Never lose a notebook full of priceless ideas again. Notebook.ai is backed up and always available. - - growth: - title: Grows with you - text: Plan as much as you want in your Notebook, for life. The only limits here are your imagination. - - sharing: - title: Brainstorm together - text: Invite anyone to review any content you decide to share. Sometimes a second set of eyes makes all the difference. - - yours: - title: Make it yours - text: Plan creatures, magic, scenes, and other page types specific to your world, tailored to you. - - quote: - text: Really clever and beautifully organized way for storytellers to create a world. - attribution: Alec Polsley, Bettr.io Director of Marketing - - pricing: - title: Notebook Pricing - subtitle: Start worldbuilding immediately. No card needed. - cta: - link: Get started now - button: Get Started - - free: Free - - starter_plan: - title: Starter - - universes_html: Plan up to 5 universes - upload_html: Upload up to 50MB of images - characters_html: Plan unlimited characters - locations_html: Plan unlimited locations - items_html: Plan unlimited items - - premium_plan: - title: Premium - price: $9/month - - universes_html: Plan unlimited universes - upload_html: Upload up to 10GB of images - characters_html: Plan unlimited characters - locations_html: Plan unlimited locations - items_html: Plan unlimited items - - countries_html: Plan unlimited countries - creatures_html: Plan unlimited creatures - deities_html: Plan unlimited deities - floras_html: Plan unlimited flora - governments_html: Plan unlimited governments - groups_html: Plan unlimited groups - landmarks_html: Plan unlimited landmarks - languages_html: Plan unlimited languages - magics_html: Plan unlimited magic - planets_html: Plan unlimited planets - races_html: Plan unlimited races - religions_html: Plan unlimited religions - scenes_html: Plan unlimited scenes - technologies_html: Plan unlimited technologies - towns_html: Plan unlimited towns - - footer: - title: Notebook.ai is an open-source project by Indent Labs. - thanks: If you like Notebook.ai, you can thank - - cta: Get Involved - - links: - source_code: Source Code on GitHub - roadmap: Browse the Roadmap - - activerecord: - models: - universe: Universe - - character: Character - location: Location - item: Item - - country: Country - creature: Creature - deity: Deity - flora: Flora - government: Government - group: Group - landmark: Landmark - language: Language - magic: Magic - planet: Planet - race: Race - religion: Religion - scene: Scene - technology: Technology - town: Town - - user: User - session: Session - - attributes: - character: - eyecolor: Eye color - facialhair: Facial hair - fave_animal: Favorite animal - fave_color: Favorite color - fave_food: Favorite food - fave_possession: Favorite possession - fave_weapon: Favorite weapon - haircolor: Hair color - identmarks: Identifying marks - - location: - map: Map - - creature: - name: Name - description: Description - type_of: Type of creature - other_names: Other names - - religion: - practicing_locations: Locations - - flora: - magics: Magical effects - creatures: Eaten by - locations: Locations found - - scene: - scene_characters: Characters in scene - scene_locations: Locations in scene - scene_items: Items in scene - - serendipitous_questions: - attributes: - universe: - history: What is %{name}’s history? - description: How would you describe %{name}? - laws_of_physics: What are the laws of physics like in %{name}? - magic_system: What is the magic system like in %{name}? - technologies: What is the level of technology like in %{name}? - - character: - age: How old is %{name}? - aliases: What other aliases does %{name} go by? - background: What is %{name}’s background? - birthday: When is %{name}’s birthday? - #birthplace: Where was %{name} born? - bodytype: What is %{name}’s body type? - description: Describe %{name}. - education: What is %{name}’s level of education? - eyecolor: What is %{name}’s eye color? - facialhair: What facial hair does %{name} have? - fave_animal: What is %{name}’s favorite animal? - fave_color: What is %{name}’s favorite color? - fave_food: What is %{name}’s favorite food? - fave_possession: What is %{name}’s favorite possession? - fave_weapon: What is %{name}’s favorite weapon? - flaws: What flaws does %{name} have? - gender: What is %{name}’s gender? - haircolor: What color is %{name}’s hair? - hairstyle: How does %{name} style their hair? - height: How tall is %{name}? - hobbies: What hobbies does %{name} have? - identmarks: What identifying marks does %{name} have? - mannerisms: What mannerisms does %{name} have? - motivations: What motivates %{name} most? - name: What is %{name}’s full name? - occupation: What is %{name}’s occupation? - pets: What pets does %{name} have? - politics: What politics does %{name} have? - prejudices: What prejudices does %{name} have? - race: What is %{name}’s race? - religion: What religion does %{name} practice? - role: What is %{name}’s role in your story? - skintone: What skin tone does %{name} have? - talents: What talents does %{name} have? - weight: How much does %{name} weigh? - - item: - #current_owner: Who currently owns %{name}? - description: Describe %{name}. - item_type: What type of item is %{name}? - #made_by: Who made %{name}? - magic: What kind of magic does %{name} possess? - materials: What is %{name} made out of? - name: What is %{name}’s full name? - #original_owner: Who originally owned %{name}? - #past_owners - weight: How much does %{name} weigh? - year_made: When was %{name} made? - - location: - area: What kind of area is %{name} in? - #capital: What is %{name}’s capital? - climate: What is the climate like in %{name}? - crops: What crops does %{name} produce? - currency: What currencies are used in %{name}? - established_year: When was %{name} established? - founding_story: How was %{name} founded? - language: What languages are spoken in %{name}? - #largest_city: What is %{name}’s largest city? - laws: What are the laws in %{name}? - located_at: Where is %{name} located? - motto: What is %{name}’s motto? - #notable_cities: What notable cities are located in %{name}? - notable_wars: What notable wars has %{name} been involved in? - population: What is %{name}’s population? - sports: What sports are played in %{name}? - type_of: What type of location is %{name}? - - description: Describe %{name}. - name: What is %{name}’s full name? - - creature: - description: How would you describe a %{name}? - type_of: What type of creature is a %{name}? - other_names: What other names is a %{name} sometimes called? - - color: What colors does a %{name} come in? - shape: How would you describe the shape of a %{name}? - size: How big (or small) is the usual %{name}? - notable_features: What physical features are most notable for a %{name}? - materials: What materials (feathers, scales, etc) is a %{name} made of? - - aggressiveness: How aggressive is the average %{name}? - attack_method: What methods does a %{name} use to attack? - defense_method: How does a %{name} defend itself from attackers? - maximum_speed: How fast can a %{name} move? - strengths: What are the notable strengths of a %{name}? - weaknesses: What are the notable weaknesses of a %{name}? - sounds: What sounds does a %{name} make? - spoils: When hunted, what spoils does a %{name} leave behind? - - preferred_habitat: What kind of habitat is best for a %{name}? - food_sources: Where does a %{name} find its food? - migratory_patterns: Does a %{name} have any migratory patterns? - reproduction: How does a %{name} reproduce? - herd_patterns: What herd patterns does a %{name} have? - - similar_animals: What other animals is a %{name} most like? - symbolisms: What symbolisms does the %{name} hold in your world? - - race: - description: How would you describe %{name} people? - other_names: What other names do %{name} have? - - body_shape: What does the average %{name} body shape look like? - skin_colors: What skin color(s) are common on the %{name} race? - height: How tall is the average %{name}? - weight: How heavy is the average %{name}? - notable_features: What physical features on a %{name} are most noticeable? - variance: How much variance is there between individuals of the %{name} race? - clothing: What kind of clothing is common with %{name} individuals? - - strengths: What are the strengths of %{name}? - weaknesses: What are the weaknesses of %{name}? - - traditions: What traditions are common with %{name} individuals? - beliefs: What beliefs are commonly held by the %{name}? - governments: What governments are common with the %{name}? - technologies: What kinds of technologies do the %{name} societies take advantage of? - occupations: What occupations are common with %{name} individuals? - economics: What does the economic situation look like for the %{name}? - favorite_foods: What are the most common favorite foods of the %{name}? - - notable_events: What events are most important to the %{name} past? - - religion: - description: How is %{name} usually described? - other_names: What other names is %{name} known by? - - origin_story: How did %{name} first come into existence? - teachings: What values does %{name} teach? - prophecies: What prophecies does %{name} teach? - places_of_worship: Where does %{name} worship happen? - worship_services: What kind of worship services are common with %{name}? - obligations: What kinds of obligations are required of those who practice %{name}? - paradise: What does the %{name} vision of paradise look like? - - initiation: What does the %{name} initiation process entail? - rituals: What rituals are common with %{name}? - holidays: What are the %{name} holidays? - - group: - description: How would you describe the %{name} group? - other_names: What other names is %{name} known by? - - motivation: What motivates %{name}? - goal: What is the primary goal of %{name}? - obstacles: What obstacles stand in the way of %{name}? - risks: What risks are on the line for %{name}? - - inventory: What kinds of items does %{name} keep in inventory? - - magic: - description: How would you describe %{name}? - type_of: What type of magic is %{name}? - - visuals: What do the visual effects of %{name} look like? - effects: What effects does %{name} have? - - positive_effects: What positive effects does %{name} have? - negative_effects: What negative effects does %{name} have? - neutral_effects: What neutral effects does %{name} have? - - element: What element is %{name} most closely aligned to? - - resource_costs: What resource costs are required to use %{name}? - materials: What materials are required to use %{name}? - skills_required: What skills are required to use %{name}? - limitations: What limitations does %{name} have? What can't it do? - - language: - other_names: What other names is %{name} known by? - - history: What is the history of %{name}? - #typology: - #dialetical_information: - #register: - - #phonology: - - #grammar: - - #numbers: - #quantifiers: - - flora: - name: What's the name of this flora? - description: How would you describe %{name}? - aliases: What other names is %{name} known by? - - colorings: What kinds of colorings are found on %{name}? - size: How big does %{name} grow? - smell: What does %{name} smell like? - taste: What does %{name} taste like? - - fruits: What fruits does %{name} produce? - seeds: What kinds of seeds does %{name} produce? - nuts: What kinds of nuts does %{name} produce? - berries: What kinds of berries does %{name} produce? - medicinal_purposes: Does %{name} have any medicinal use? - - reproduction: How does %{name} reproduce and spread? - seasonality: What seasons or climates is %{name} most often found in? - - town: - name: What's the name of this town? - description: How would you describe %{name}? - other_names: What other names is %{name} known by? - - laws: What are the major laws in %{name}? - sports: What sports are popular in %{name}? - politics: What are the politics like in %{name}? - - founding_story: How was %{name} founded? - established_year: When was %{name} founded? - - landmark: - name: What's the name of this landmark? - description: How would you describe %{name}? - other_names: What other names is %{name} known by? - - size: How big is %{name}? - materials: What materials was %{name} constructed with? - colors: What color(s) is %{name}? - - creation_story: How did %{name} originate? - established_year: When did %{name} originate? - - country: - name: What's the name of this country? - description: How would you describe %{name}? - other_names: What other names is %{name} known by? - - population: What is the population of %{name}? - currency: What currency is used in %{name}? - laws: What are the major laws in %{name}? - sports: What sports are popular in %{name}? - - area: How big is %{name}? - crops: What crops does %{name} import or export? - climate: What is the climate like in %{name}? - - founding_story: How was %{name} founded? - established_year: When was %{name} founded? - notable_wars: What notable wars has %{name} participated in? - - technology: - name: What's the name of this technology? - description: How would you describe %{name}? - other_names: What other names is %{name} known by? - - materials: What materials is %{name} made with? - manufacturing_process: How is %{name} produced and manufactured? - sales_process: How is %{name} sold? - cost: How much does %{name} cost? - - rarity: How rare (or common) is %{name}? - - purpose: What is %{name} used for? - how_it_works: How does %{name} work? - resources_used: What resources does %{name} use? - - physical_description: What does %{name} look like? - size: How big is the average %{name}? - weight: How much does the average %{name} weigh? - colors: What colors are the average %{name}? - - planet: - name: What's the name of %{name}? - description: How would you describe %{name}? - - size: How big is %{name}? - surface: What is the surface of %{name} like? - climate: What's the climate on %{name} like? - weather: What's the weather like on %{name}? - water_content: What's the water content like on %{name}? - natural_resources: What natural resources are there on %{name}? - - length_of_day: How long is daytime on %{name}? - length_of_night: How long is night time on %{name}? - calendar_system: What's the calendar system like on %{name}? - - population: What's the population like on %{name}? - - moons: Does %{name} have moons? If so, what are they? - orbit: What does %{name}'s astral orbit look like? - visible_constellations: What constellations are visible from %{name}? - - first_inhabitants_story: How did the first inhabitants arrive on this planet? - world_history: What is the world history of %{name}? - - government: - name: What's the name of %{name}? - description: How would you describe %{name}? - - type_of_government: What type of government is %{name}? - power_structure: How is %{name}'s power structured? How is it organized? Who has what powers? - power_source: Where does %{name}'s source of power come from? - checks_and_balances: What checks and balances does %{name} have in place? - - sociopolitical: What sociopolitical ideologies does %{name} hold? - socioeconomical: What socioeconomical ideologies does %{name} hold? - geocultural: What geocultural ideologies does %{name} hold? - laws: What are the laws of %{name}? - immigration: What immigration policies and ideologies does %{name} hold? - privacy_ideologies: What does %{name} think about privacy? - - electoral_process: What is the electoral process of %{name}? - term_lengths: What are the term lengths for people in %{name}? - criminal_system: What is %{name}'s criminal system like? - - approval_ratings: What do the people think of %{name}? What are their approval ratings? - international_relations: What do international governments think about %{name}? How are their relations? - civilian_life: What is civilian life like for the people ruled by %{name}? - - military: What does %{name}'s military look like? - navy: What does %{name}'s navy look like? - airforce: What does %{name}'s airforce look like? - space_program: Does %{name} have a space program? What is it like? - - founding_story: How was %{name} created? What is its founding story? - flag_design_story: How was %{name}'s flag designed? - notable_wars: What notable wars throughout history has %{name} been involved in? - - deity: - name: What is %{name}'s name? - description: How would you describe %{name}? - other_names: What other names is %{name} known by? - - physical_description: How would you describe what %{name} looks like physically? - height: How tall is %{name}? - weight: How much does %{name} weigh? - - symbols: What symbols are commonly associated with %{name}? - elements: What elements are commonly associated with %{name}? - - strengths: What are %{name}'s strengths? - weaknesses: What are %{name}'s weaknesses? - - prayers: What prayers are commonly associated with %{name}? How do followers pray? - rituals: What rituals are commonly associated with %{name}? How do they work? - human_interaction: How often does %{name} interact with their followers? In what ways? - - notable_events: What notable events throughout history has %{name} been a part of? - family_history: What is %{name}'s family history? - life_story: What is %{name}'s life story? - - blacklist: - _: - - id - - user_id - - privacy - location: - - map_content_type - - map_file_name - - map_file_size - - map_updated_at - - content_oneliners: - universe: Encapsulate your worlds - character: The souls of your world - location: A world of possibilities - item: Every item has a story - country: Kingdoms, countries, and regions - creature: Your personal bestiary - deity: Gods, goddesses, and celestial beings - flora: The plants and nature of your world - government: The governments of your world - group: From fellowships to organizations - landmark: Statues, caves, peaks, and more - language: Design your own languages - magic: Spells, potions, and other magical things - planet: Planets, separated by space - race: The melting pot of cultures - religion: What do your characters believe in? - scene: Create scenes to organize a plot - technology: Gadgets, gizmos, and advanced technology - town: Civilization's establishments - - content_descriptions: - universe: > - Track multiple stories simultaneously by organizing your ideas into just the universe they - belong in. - character: > - From your heroes to the little guys that live in the background, everyone plays a role in strong - stories. - location: > - From magical mountains to urban modern settings, locations are the - lifeblood of worldbuilding. - item: > - Track books, weapons, artifacts, and other items in your world: who made them, owns them, and more. - creature: > - Your personal bestiary includes the wildlife, critters, merfolk, and other interesting beings of - your world. - race: > - Humans are often joined by elves, orcs, werewolves, vampires, dragons, and a myriad of other races. - religion: > - Organizing your world's beliefs into cohesive religions can lead to a more epic world for your readers. - group: > - Use groups to bundle your characters, locations, items, or other ideas into any kind of collection - you need. - magic: > - Often a source of magic creates a multitude of spells, potions, and occasional trinkets. - language: > - Language is the bond that weaves a culture's words together. Are there any new languages in your world? - flora: > - The plants, flowers, trees, and other nature in your world. Paint your landscape with rich flora. - town: > - Towns across the country are pockets of interesting life, filled with characters and more. - country: > - Kingdoms, countries, regions, and more. Huge swathes of land are often claimed quickly. - landmark: > - From the smallest statue to the biggest mountain, landmarks are littered across the land. - scene: > - Scenes are events that happen in your world, ranging in size from a nice breakfast to entire wars. - planet: > - Celestial bodies orbiting through space, carrying a planet's-worth of worldbuilding on them. - deity: > - Gods, goddesses, and other godly beings in your world — every world came from somewhere. - government: > - The organizations of your world that keep it running smoothly (or not): governments. - technology: > - Create your gadgets, gizmos, and all kinds of advanced (or primitive) technologies. - attributefield: > - Attributes can be anything you need to define just the detail you need. Select the type of content - you're describing and setup any number of attributes to do the job. - attributecategory: > - Attribute Categories are groupings of attributes you can attach to any specified resource. Each of the - tabs across the top of a notebook page are examples of an attribute category. - - create_success: "%{model_name} was successfully created." - update_success: "%{model_name} was successfully updated." - delete_success: "%{model_name} was successfully deleted." - - location_create_upload_map_error: > - Location was created, but your map did not upload. Please try again. - - location_update_upload_map_error: > - Location was updated, but your map did not upload. Please try again. - - thredded: - nav: - all_messageboards: Notebook.ai Forums - settings: Settings - private_topics: Inbox - search: - form: - placeholder: Search Discussions - preferences: - global_preferences_title: Preferences - messageboard_preferences_nav_title: Per-category Settings - messageboard: - create: Create a New Discussion Board - topics_and_posts_counts: "%{topics_count} threads / %{posts_unread} unread" - last_updated_by_html: "%{user} commented %{time_ago}" - index: - page_title: Discussions - topics: - follow: Follow this discussion - form: - create_btn: Create New Discussion - title_placeholder_start: Start a New Discussion - following: - auto: You are following this discussion because auto-follow is enabled. - manual: You are following this discussion. - mentioned: You are following this discussion because you were mentioned on it. - posted: You are following this discussion because you posted to it. - posts: - delete: Delete reply - delete_confirm: Are you sure you want to delete this reply? - deleted_notice: Your reply has been deleted. - form: - create_btn: Post reply - title_label: Reply to this discussion - - body_types: - - Delicate - - Flat - - Fragile - - Lean - - Lightly muscled - - Small-shouldered - - Thin - - Athletic - - Hourglass - - Bodybuilder - - Rectangular - - Muscular - - Thick-skinned - - Big-boned - - Round physique - - Pear-shaped - - eye_colors: - - Amber - - Black - - Arctic blue - - Baby blue - - China blue - - Cornflower blue - - Crystal blue - - Denim blue - - Electric blue - - Indigo - - Sapphire blue - - Sky blue - - Champagne brown - - Chestnut brown - - Chocolate brown - - Golden brown - - Honey brown - - Topaz - - Charcoal grey - - Cloudy grey - - Steel grey - - Chartreuse - - Emerald green - - Forest green - - Grass green - - Jade green - - Leaf green - - Sea green - - Hazel - - Amethyst - - Hyacinth - - Ultramarine blue - - One green, one blue - - One blue, one brown - - One brown, one blue - - One brown, one green - - Light violet - - Dark violet - - facial_hair_styles: - - Beard, long - - Beard, short - - Chin curtain - - Chinstrap - - Fu Manchu, short - - Fu Manchu, long - - Goatee - - Handlebar mustache - - Horseshoe mustache - - Mustache - - Mutton chops, thin - - Mutton chops, thick - - Neckbeard - - Pencil mustache - - Shenandoah - - Sideburns - - Soul patch - - Light stubble - - Thick stubble - - Toothbrush mustache - - Van Dyke beard - - Patchy beard - - Patchy mustache - - hair_colors: - - Blonde - - Black - - Brown - - Red - - Bald - - White - - Grey - - Balding - - Greying - - Bleached - - Blue - - Green - - Purple - - Orange - - Auburn - - Strawberry - - Chestnut - - Dirty Blonde - - Rainbow - - Black tips - - Jet black - - Raven black - - hair_styles: - - Afro - - Bald - - Balding - - Bob cut - - Bowl cut - - Bouffant - - Braided - - Bun - - Butch - - Buzz cut - - Chignon - - Chonmage - - Comb over - - Cornrows - - Crew cut - - Dreadlocks - - Emo - - Fauxhawk - - Feathered - - Flattop - - Fringe - - Liberty Spikes - - Long hair, straight - - Long hair, curly - - Long hair, wavy - - Mohawk - - Mop-top - - Odango - - Pageboy - - Parted - - Pigtails - - Pixie cut - - Pompadour - - Ponytail - - Rattail - - Rocker - - Slicked back - - Spiky, short - - Spiky, long - - Short, curly - - Short, wavy - - Short, thin - - Short, straight - - identifying_marks: - - minor scar - - large scar - - mole - - fleshy growth - - tattoo - - discoloration - - on_the: on the - - identifying_mark_locations: - - left eye - - right eye - - left thigh - - right thigh - - left shin - - right shin - - left foot - - right foot - - big toe - - hip - - stomach - - lower back - - chest - - upper back - - left shoulder - - right shoulder - - left bicep - - right bicep - - left tricep - - right tricep - - left hand - - right hand - - pointer finger - - thumb - - neck - - scalp - - above lip - - nose - - left ear - - right ear - - forehead - - left cheek - - right cheek - - left temple - - right temple - - chin - - beneath chin - - male_first_names: - - James - - John - - Robert - - Michael - - William - - David - - Richard - - Charles - - Joseph - - Thomas - - Christopher - - Daniel - - Paul - - Mark - - Donald - - George - - Kenneth - - Steven - - Edward - - Brian - - Ronald - - Anthony - - Kevin - - Jason - - Matthew - - Gary - - Timothy - - Jose - - Larry - - Jeffrey - - Frank - - Scott - - Eric - - Stephen - - Andrew - - Raymond - - Gregory - - female_first_names: - - Mary - - Patricia - - Linda - - Barbara - - Elizabeth - - Jennifer - - Maria - - Susan - - Margaret - - Margret - - Dorothy - - Lisa - - Nancy - - Karen - - Betty - - Helen - - Sandra - - Donna - - Carol - - Ruth - - Sharon - - Michelle - - Laura - - Sarah - - Kimberly - - Deborah - - Jessica - - Shirley - - Cynthia - - Angela - - Melissa - - Brenda - - Amy - - Anna - - Rebecca - - Virginia - - Kathleen - - Pamela - - last_names: - - Smith - - Brown - - Lee - - Wilson - - Martin - - Patel - - Taylor - - Wong - - Campbell - - Williams - - Thompson - - Jones - - Johnson - - Miller - - Davis - - Garcia - - Rodriguez - - Martinez - - Anderson - - Jackson - - White - - Green - - Lee - - Harris - - Clark - - Lewis - - Robinson - - Walker - - Hall - - Young - - Allen - - Sanchez - - Wright - - King - - Scott - - Roberts - - Carter - - Phillips - - Evans - - Turner - - Torres - - Parker - - Collins - - Stewart - - Flores - - Morris - - Nguyen - - Murphy - - Rivera - - Cook - - Morgan - - Peterson - - Cooper - - Gomez - - Ward - - character_races: - - Android - - Angel - - Animal - - Arachnoid - - Bird - - Construct - - Dark Elf - - Dwarf - - Elemental - - Elf - - Fairy - - Fey - - Genie - - Gnome - - Half-Dwarf - - Half-Elf - - Half-Orc - - Halfling - - Human - - Insectoid - - Orc - - Reptilian - - Robot - - Spirit - - Vampire - - Werewolf - - skin_tones: - - Albino - - Light - - Pale white - - Fair - - White - - Medium - - Olive - - Moderate brown - - Brown - - Dark brown - - Chocolate - - Black - - Grey - - Green - - Blue - - Red - - Jet black - - Raven black - - archetypes: - - Anthropomorphic Personification - - Anti-Hero - - Archmage - - Barefoot Sage - - Big Fun - - Blind Seer - - Blue-Collar Warlock - - Bruiser with a Soft Center - - The Champion - - The Chosen One - - The Chooser of The One - - Classic Villain - - The Cynic - - The Dragonslayer - - The Drunken Sailor - - Dumb Muscle - - Eccentric Mentor - - Enigmatic Empowering Entity - - Evil Overlord - - The Fair Folk - - Father Neptune - - Ferryman - - The Fool - - Fool for Love - - Gentle Giant - - The Good King - - Granny Classic - - The Grotesque - - Herald - - Heroic Archetype - - Heroic Wannabe - - The High Queen - - Higher Self - - The Hunter - - Ideal Hero - - The Idealist - - Ineffectual Loner - - The Kirk - - The Klutz - - Knight in Shining Armor - - Lady and Knight - - Loser Archetype - - Lovable Rogue - - Magical Barefooter - - Mary Sue - - The McCoy - - Mentor - - Messianic - - Mixed - - Mock Millionaire - - Modern Major General - - My Girl Back Home - - Obstructive Bureaucrat - - Oedipus Complex - - Old Soldier - - The Paladin - - The Patriarch - - Person of Mass Destruction - - The Pollyanna - - Powers That Be - - Prince Charming - - Princess Classic - - A Protagonist Shall Lead Them - - Rebel Leader - - Rebellious Spirit - - Reluctant Monster - - Satanic Archetype - - Seeker Archetype - - Shadow Archetype - - Shapeshifter - - The Spock - - Star-Crossed Lovers - - The Storyteller - - Threshold Guardians - - Turn Coat - - The Trickster - - Visitor - - Wicked Stepmother - - Wicked Witch - - Wizard Classic - - Wolf Man - - World's Best Warrior - - World's Most Beautiful Woman - - World's Strongest Man - - location_name_prefixes: - - New - - Los - - Fort - - City of - - El - - Saint - - Des - - Little - - Big - - North - - East - - South - - West - - Round - - The - - Broken - - Santa - - location_name_suffixes: - - Port - - City - - Grove - - Pines - - Falls - - Heights - - Oaks - - Rapids - - Valley - - Mountains - - Peaks - - Arbor - - Mesa - - Gardens - - Palms - - Beach - - Bend - - Ruins - - location_name_syllables: - - lo - - chi - - ca - - go - - hou - - ston - - nix - - pho - - an - - ant - - ton - - io - - san - - die - - dia - - dal - - las - - son - - vil - - pol - - ral - - polis - - na - - aus - - tin - - fran - - cis - - co - - col - - umb - - bus - - cha - - mem - - phis - - sea - - wor - - the - - tha - - den - - was - - bal - - ti - - mo - - ash - - wau - - kee - - ki - - ru - - lu - - cest - - pro - - ora - - ode - - mu - - ill - - ville - - vil - - shield_types: - - Greek aspis - - Buckler - - Heater shield - - Heraldic shield - - Leather shield - - Hide shield - - Hoplon shield - - Kite shield - - Scutum - - Targe - - weapon_types: - - Bastard sword - - Battleaxe - - Bolas - - Bow & Arrow - - Bowstaff - - Brass knuckles - - Broom - - Chainsaw - - Club - - Dagger - - Darts - - Falchion - - Flail - - Gauntlet - - Glaive - - Greataxe - - Greatsword - - Halberd - - Handaxe - - Hand crossbow - - Heavy crossbow - - Javelin - - Kama - - Kukri - - Lance - - Longbow - - Longsword - - Madu - - Morningstar - - Net - - Nunchaku - - Pocket knife - - Quarterstaff - - Ranseur - - Rapier - - Repeating crossbow - - Sai - - Sap - - Scimitar - - Scythe - - Shortsword - - Shortbow - - Shortspear - - Shuriken - - Siangham - - Sickle - - Sling - - Spear - - Throwing axe - - Trident - - Warhammer - - Whip - - axe_types: - - Bardiche - - Battleaxe - - Broadaxe - - Handaxe - - Hatchet - - Long-bearded axe - - Tomahawk - - bow_types: - - Longbow - - Sling - - Blowgun - - Flatbow - - Composite bow - - Yumi - - Gungdo - - Shortbow - - Arbalest - - Crossbow - - Repeating crossbow - - club_types: - - Boomerang - - Frying pan - - Hammer - - Brick - - Mace - - Morningstar - - Sai - - Scepter - - Sledgehammer - - Lamp - - Glass bottle - - Warhammer - - Wrench - - Crowbar - - fist_weapon_types: - - Bahh nakh, tiger claws - - Brass knuckles - - Cestus - - Deer horn knives - - Finger knife - - Gauntlets - - Katar - - Korean fan - - Madu, buckhorn stick - - Pata sword gauntlet - - Push dagger - - Roman scissor - - War fan - - Wind and fire wheels - - Emei daggers - - Large stone - - Brick - - flexible_weapon_types: - - Bullwhip - - Cat o' nine tails - - Chain whip - - Lasso - - Nunchaku - - Flail - - Meteor hammer - - thrown_weapon_types: - - Harpoon - - Bolas - - Javelin - - Pilum - - Woomera - - Angon - - Chakram - - Kunai - - Boomerang - - Throwing knife - - Thrown darts - - Swiss arrow - - Francisca - - Tomahawk - - Shuriken - - Stones - - polearm_types: - - Bo - - Taiji staff - - Quarterstaff - - Staff - - Spear - - Lance - - Pike - - Pitchfork - - Qiang - - Ranseur - - Spetum - - Swordstaff - - Trident - - Bardiche - - Bill - - Glaive - - Halberd - - Lochaber axe - - Naginata - - Partizan - - Scythe - - Voulge - - War scythe - - shortsword_types: - - Dagger - - Fireplace poker - - Small sword - - Xiphos shortsword - - Aikuchi shortsword - - Kodachi shortsword - - Pinuti shortsword - - Wakizashi shortsword - - sword_types: - - Cutlass - - Dao - - Dha - - Falchion - - Hunting sword - - Kukri - - Pulwar - - Sabre - - Scimitar - - Shamshir - - Talwar - - Epee - - Flamberge - - Longsword - - Ninjato - - Rapier - - Katana - - Claymore - - Dadao - - Executioner's sword - - Flambard - - Greatsword - - Nodachi - - Falcata - - Machete - - Yatagan - - other_item_types: - - Book - - Scroll - - Relic - - Artifact - - Plot device - - Hat - - Stone - - Material + hello: "Hello world" diff --git a/config/routes.rb b/config/routes.rb index f20b1786..3f66539d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,251 +1,56 @@ -# rubocop:disable LineLength - Rails.application.routes.draw do - get 'customization/content_types' - post 'customization/toggle_content_type' + # The priority is based upon order of creation: first created -> highest priority. + # See how all your routes lay out with "rake routes". - devise_for :users, :controllers => { registrations: 'registrations' } - resources :users do - get :characters, on: :member - get :locations, on: :member - get :items, on: :member - get :creatures, on: :member - get :races, on: :member - get :religions, on: :member - get :magics, on: :member - get :languages, on: :member - get :floras, on: :member - get :towns, on: :member - get :countries, on: :member - get :landmarks, on: :member - get :scenes, on: :member - get :groups, on: :member - get :universes, on: :member - get :planets, on: :member - get :technologies, on: :member - get :deities, on: :member - get :governments, on: :member - # - end + # You can have the root of your site routed with "root" + # root 'welcome#index' - delete 'contributor/:id/remove', to: 'contributors#destroy', as: :remove_contributor + # Example of regular route: + # get 'products/:id' => 'catalog#view' - get '/unsubscribe/emails/:code', to: 'emails#one_click_unsubscribe' + # Example of named route that can be invoked with purchase_url(id: product.id) + # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase - # Main pages - root to: 'main#index' + # Example resource route (maps HTTP verbs to controller actions automatically): + # resources :products - # Info pages - scope '/about' do - #get '/notebook', to: 'main#about_notebook', as: :about_notebook - get '/privacy', to: 'main#privacyinfo', as: :privacy_policy - end + # Example resource route with options: + # resources :products do + # member do + # get 'short' + # post 'toggle' + # end + # + # collection do + # get 'sold' + # end + # end - # Landing pages - scope '/for' do - get '/writers', to: 'main#for_writers', as: :writers_landing - get '/roleplayers', to: 'main#for_roleplayers', as: :roleplayers_landing - get '/designers', to: 'main#for_designers', as: :designers_landing + # Example resource route with sub-resources: + # resources :products do + # resources :comments, :sales + # resource :seller + # end - get '/friends', to: 'main#for_friends', as: :friends_landing - end + # Example resource route with more complex sub-resources: + # resources :products do + # resources :comments + # resources :sales do + # get 'recent', on: :collection + # end + # end - scope '/vote' do - get '/community', to: 'main#feature_voting', as: :community_voting - get '/:id', to: 'voting#vote', as: :cast_vote - end + # Example resource route with concerns: + # concern :toggleable do + # post 'toggle' + # end + # resources :posts, concerns: :toggleable + # resources :photos, concerns: :toggleable - # User-centric stuff - scope '/my' do - get '/content', to: 'main#dashboard', as: :dashboard - get '/content/recent', to: 'main#recent_content', as: :recent_content - get '/submissions', to: 'main#comingsoon' - get '/prompts', to: 'main#prompts', as: :prompts - get '/scratchpad', to: 'main#notes', as: :notes - - # Billing - scope '/billing' do - #get '/', to: 'subscriptions#show', as: :billing - get '/subscription', to: 'subscriptions#new', as: :subscription - - get '/to/:stripe_plan_id', to: 'subscriptions#change', as: :change_subscription - - get '/information', to: 'subscriptions#information', as: :payment_info - post '/information', to: 'subscriptions#information_change', as: :process_payment_info - - # This should probably be a DELETE - get '/payment_method/delete', to: 'subscriptions#delete_payment_method', as: :delete_payment_method - end - end - resources :documents - delete 'delete_my_account', to: 'users#delete_my_account' - - # Lab apps - scope '/app' do - # Navigator - get 'navigator', to: 'navigator#index' - - # Babel - get 'babel', to: 'lab#babel' - post 'babel', to: 'lab#babel' - - # Pinboard - get 'pinboard', to: 'lab#pinboard' - end - - # Sessions - get '/login', to: 'sessions#new', as: :login - post '/login', to: 'sessions#create', as: :login_process - get '/logout', to: 'sessions#destroy', as: :logout - - # Planning - scope '/plan' do - # Core content types - resources :universes do - get :characters, on: :member - get :locations, on: :member - get :items, on: :member - get :creatures, on: :member - get :races, on: :member - get :religions, on: :member - get :magics, on: :member - get :languages, on: :member - get :floras, on: :member - get :scenes, on: :member - get :groups, on: :member - get :countries, on: :member - get :towns, on: :member - get :landmarks, on: :member - get :planets, on: :member - get :technologies, on: :member - get :deities, on: :member - get :governments, on: :member - # - end - resources :characters do - get :autocomplete_character_name, on: :collection, as: :autocomplete_name - end - resources :items - resources :locations do - get :autocomplete_location_name, on: :collection, as: :autocomplete_name - end - - # Extended content types - resources :creatures - resources :races - resources :religions - resources :magics - resources :languages - resources :floras - resources :towns - resources :countries - resources :landmarks - resources :scenes - resources :groups - resources :planets - resources :technologies - resources :deities - resources :governments - # - - # Content attributes - resources :attributes - resources :attribute_categories - resources :attribute_fields - - # Image handling - delete '/delete/image/:id', to: 'image_upload#delete', as: :image_deletion - - # Coming Soon TM - get '/plots', to: 'main#comingsoon' - end - get 'search/', to: 'search#results' - - scope 'admin' do - get '/', to: 'admin#dashboard', as: :admin_dashboard - get '/content_type/:type', to: 'admin#content_type', as: :admin_content_type - - get '/attributes', to: 'admin#attributes', as: :admin_attributes - end - - scope 'export' do - get '/', to: 'export#index', as: :notebook_export - - get '/outline', to: 'export#outline', as: :notebook_outline - get '/notebook.json', to: 'export#notebook_json', as: :notebook_json - get '/notebook.xml', to: 'export#notebook_xml', as: :notebook_xml - get '/:model.csv', to: 'export#csv', as: :notebook_csv - end - - scope '/scene/:scene_id' do - get 'editor', to: 'write#editor' - end - - # API Endpoints - scope '/generate' do - # General information - - # Character information - scope '/character' do - get '/age', to: 'characters_generator#age' - get '/bodytype', to: 'characters_generator#bodytype' - get '/eyecolor', to: 'characters_generator#eyecolor' - get '/facial-hair', to: 'characters_generator#facialhair' - get '/haircolor', to: 'characters_generator#haircolor' - get '/hairstyle', to: 'characters_generator#hairstyle' - get '/height', to: 'characters_generator#height' - get '/identifying-mark', to: 'characters_generator#identifyingmark' - get '/name', to: 'characters_generator#name' - get '/race', to: 'characters_generator#race' - get '/skintone', to: 'characters_generator#skintone' - get '/weight', to: 'characters_generator#weight' - end - - # Location information - scope '/location' do - get '/name', to: 'locations_generator#name' - end - - # Equipment location - scope '/equipment' do - scope '/weapon' do - get '/', to: 'equipment_generator#weapon' - - get '/axe', to: 'equipment_generator#weapon_axe' - get '/bow', to: 'equipment_generator#weapon_bow' - get '/club', to: 'equipment_generator#weapon_club' - get '/fist', to: 'equipment_generator#weapon_fist' - get '/flexible', to: 'equipment_generator#weapon_flexible' - # TODO: /gun - get '/polearm', to: 'equipment_generator#weapon_polearm' - get '/shortsword', to: 'equipment_generator#weapon_shortsword' - get '/sword', to: 'equipment_generator#weapon_sword' - get '/thrown', to: 'equipment_generator#weapon_thrown' - end - - scope '/armor' do - get '/', to: 'equipment_generator#armor' - - get '/shield', to: 'equipment_generator#armor_shield' - end - end - end - - # Adoption Agency - scope '/adoption' do - get '/', to: 'main#comingsoon' - end - - # Idea Market - scope '/market' do - get '/', to: 'main#comingsoon' - end - - # get '/forum', to: 'emergency#temporarily_disabled' - # get '/forum/:wildcard', to: 'emergency#temporarily_disabled' - # get '/forum/:wildcard/:another', to: 'emergency#temporarily_disabled' - mount Thredded::Engine => '/forum' - mount StripeEvent::Engine, at: '/webhooks/stripe' + # Example resource route within a namespace: + # namespace :admin do + # # Directs /admin/products/* to Admin::ProductsController + # # (app/controllers/admin/products_controller.rb) + # resources :products + # end end - -# rubocop:enable LineLength diff --git a/config/secrets.yml b/config/secrets.yml index e07acc87..2996143b 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -11,13 +11,12 @@ # if you're sharing your code publicly. development: - secret_key_base: d522bcefa477c6fbfe9b6c69f25a41f242e26cfd281dcfbb6c867e41e3b56c1c9ac6007737742b70b55a66207b2284f129734345707507c7b0d34fb45218005c + secret_key_base: 2a94ac1e5b28231c509150355e07342a973d53a2115614502e38bbe099e765cc4af2955d13de153c55226fb34c7e4a2c629551f81466e3ff92880e5dae7178e7 test: - secret_key_base: ecaa93d4fba650ef30ef4925df71b8e9e8bdb47f0424166a2689950e268a1d27227a27f72f8f790f4272c2ef5ad06e86d05dad20eecd8df6c47ab12bed37c27a + secret_key_base: 3fe5e375a25a995117c39a1ab942a1c0b9bbedbc3c112713452ada289096bbc16f9e0ba7122db38dc5c90944f6a4d46b1aa9341971ada82f6649c730f67a6b0d # Do not keep production secrets in the repository, # instead read values from the environment. production: - secret_token: <%= ENV['SECRET_TOKEN'] %> secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> From 3f3c3cb3e688e502fe6d1e9844b6f1f793b4f266 Mon Sep 17 00:00:00 2001 From: Tristan Date: Wed, 4 Jul 2018 20:46:21 -0500 Subject: [PATCH 02/26] upgrade fixes --- Gemfile | 3 +++ Gemfile.lock | 2 ++ config/application.rb | 6 ++++++ config/environments/development.rb | 4 ++++ config/environments/production.rb | 27 +++++++++++++++++++++++++++ config/environments/test.rb | 4 ++++ 6 files changed, 46 insertions(+) diff --git a/Gemfile b/Gemfile index 503d4e3f..1f2e3808 100644 --- a/Gemfile +++ b/Gemfile @@ -70,6 +70,9 @@ gem 'thredded' gem 'rails-ujs' gem 'delayed_job_active_record' +# Exports +gem 'csv' + # Tech debt & hacks gem 'binding_of_caller' # see has_changelog.rb diff --git a/Gemfile.lock b/Gemfile.lock index b45ca566..c9c7b358 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,6 +116,7 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) + csv (1.0.0) cucumber (3.1.1) builder (>= 2.1.2) cucumber-core (~> 3.1.0) @@ -499,6 +500,7 @@ DEPENDENCIES codeclimate-test-reporter coffee-rails coveralls + csv cucumber-rails database_cleaner dateslices diff --git a/config/application.rb b/config/application.rb index ab0edcbb..b197df3d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -8,6 +8,9 @@ Bundler.require(*Rails.groups) module Notebook class Application < Rails::Application + config.autoload_paths += Dir[Rails.root.join('app', 'models', '{*/}')] + config.autoload_paths += Dir[Rails.root.join('app', 'services', '{*/}')] + # 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. @@ -20,6 +23,9 @@ module Notebook # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de + # Use delayed_job to process jobs + config.active_job.queue_adapter = :delayed_job + # Do not swallow errors in after_commit/after_rollback callbacks. config.active_record.raise_in_transactional_callbacks = true end diff --git a/config/environments/development.rb b/config/environments/development.rb index b55e2144..3a654803 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -38,4 +38,8 @@ Rails.application.configure do # Raises error for missing translations # config.action_view.raise_on_missing_translations = true + + # Set test-mode Stripe API key + Stripe.api_key = "sk_test_v37uWbseyPct6PpsfjTa3y1l" + config.stripe_publishable_key = 'pk_test_eXI4iyJ2gR9UOGJyJERvDlHF' end diff --git a/config/environments/production.rb b/config/environments/production.rb index 5c1b32e4..85fd376e 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -76,4 +76,31 @@ Rails.application.configure do # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false + + # Devise default url options + config.action_mailer.default_url_options = { host: 'www.notebook.ai', port: 80 } + ActionMailer::Base.smtp_settings = { + :address => "smtp.sendgrid.net", + :port => 587, + :authentication => :plain, + :user_name => ENV['SENDGRID_USERNAME'], + :password => ENV['SENDGRID_PASSWORD'], + :domain => ENV['SENDGRID_DOMAIN'], + :enable_starttls_auto => true + } + + # S3 settings for Paperclip uploads + config.paperclip_defaults = { + storage: :s3, + s3_credentials: { + bucket: ENV.fetch('S3_BUCKET_NAME', 'notebook-content-uploads'), + s3_region: ENV.fetch('AWS_REGION', 'us-east-1'), + access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'), + secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY') + } + } + + # Set production Stripe API key + Stripe.api_key = ENV['STRIPE_API_KEY'] + config.stripe_publishable_key = ENV['STRIPE_PUBLISHABLE_KEY'] end diff --git a/config/environments/test.rb b/config/environments/test.rb index 1c19f08b..884f3004 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -39,4 +39,8 @@ Rails.application.configure do # Raises error for missing translations # config.action_view.raise_on_missing_translations = true + + # Set test-mode Stripe API key + Stripe.api_key = "We-don't-want-to-actually-hit-Stripe-from-tests" + config.stripe_publishable_key = 'pk_test_eXI4iyJ2gR9UOGJyJERvDlHF' end From 52bac9fd4805a4d404694665ecc9586a2330eeb7 Mon Sep 17 00:00:00 2001 From: Tristan Date: Wed, 4 Jul 2018 20:47:38 -0500 Subject: [PATCH 03/26] restore i18n file --- config/locales/en.yml | 1478 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 1477 insertions(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 06539571..fc66c91e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -19,5 +19,1481 @@ # To learn more, please read the Rails Internationalization guide # available at http://guides.rubyonrails.org/i18n.html. +# UTF-8 + en: - hello: "Hello world" + no_view_permission: You don't have permission to view that! + no_do_permission: You don't have permission to do that! + must_be_logged_in: You must be logged-in to do that! + + username_password_incorrect: Username or password incorrect + login_successful: Login successful. + logged_out: Logged out! + + all_universes: All universes + + marketing: + landing_page: + promo_header: Your digital notebook is here. + promo_subheader: Notebook.ai grows with your ideas and collaborates back with you. + promo_subtext: Start worldbuilding now. No card needed. + + cta: + get_yours: Get Yours + writers: + header: For writers + body: Authors use Notebook.ai to create rich, immersive worlds to set their novels, stories, and plays in. + button: Learn more + roleplayers: + header: For roleplayers + body: Dungeon masters use Notebook.ai to build worlds for their campaigns that can be shared with players. + button: Learn more + designers: + header: For designers + body: Game design teams use Notebook.ai to collaborate and keep every aspect of their world in sync. + button: Learn more + + benefits: + creativity: + title: Promotes creativity + text: Your Notebook now asks you questions about your characters and ideas, and your answers are saved too. + + speed: + title: Speeds up writing + text: With a universe of information at your fingertips, you can look up anything quickly and keep writing. + + continuity: + title: Continuity checks + text: When every little fact is stored in one place, you can rest easy knowing you won't accidentally contradict yourself. + + characters: + title: Deeper characters + text: Get to know your characters. Track every detail of their thoughts, appearance, and personality. + + locations: + title: Richer worlds + text: Immerse yourself in vibrant worlds with tracking available for any kind of locations. + + items: + title: Legendary items + text: Every object has a backstory that can shine as bright as any character — if you let it. + + search: + title: Searchable + text: Quickly find anything, anywhere. Even that random thought you jotted down at 3am two years ago. + + organization: + title: Organizable + text: Focus on one universe at a time and filter everything else out. Reorganize, sort, and write freely. + + backups: + title: Backed up forever + text: Never lose a notebook full of priceless ideas again. Notebook.ai is backed up and always available. + + growth: + title: Grows with you + text: Plan as much as you want in your Notebook, for life. The only limits here are your imagination. + + sharing: + title: Brainstorm together + text: Invite anyone to review any content you decide to share. Sometimes a second set of eyes makes all the difference. + + yours: + title: Make it yours + text: Plan creatures, magic, scenes, and other page types specific to your world, tailored to you. + + quote: + text: Really clever and beautifully organized way for storytellers to create a world. + attribution: Alec Polsley, Bettr.io Director of Marketing + + pricing: + title: Notebook Pricing + subtitle: Start worldbuilding immediately. No card needed. + cta: + link: Get started now + button: Get Started + + free: Free + + starter_plan: + title: Starter + + universes_html: Plan up to 5 universes + upload_html: Upload up to 50MB of images + characters_html: Plan unlimited characters + locations_html: Plan unlimited locations + items_html: Plan unlimited items + + premium_plan: + title: Premium + price: $9/month + + universes_html: Plan unlimited universes + upload_html: Upload up to 10GB of images + characters_html: Plan unlimited characters + locations_html: Plan unlimited locations + items_html: Plan unlimited items + + countries_html: Plan unlimited countries + creatures_html: Plan unlimited creatures + deities_html: Plan unlimited deities + floras_html: Plan unlimited flora + governments_html: Plan unlimited governments + groups_html: Plan unlimited groups + landmarks_html: Plan unlimited landmarks + languages_html: Plan unlimited languages + magics_html: Plan unlimited magic + planets_html: Plan unlimited planets + races_html: Plan unlimited races + religions_html: Plan unlimited religions + scenes_html: Plan unlimited scenes + technologies_html: Plan unlimited technologies + towns_html: Plan unlimited towns + + footer: + title: Notebook.ai is an open-source project by Indent Labs. + thanks: If you like Notebook.ai, you can thank + + cta: Get Involved + + links: + source_code: Source Code on GitHub + roadmap: Browse the Roadmap + + activerecord: + models: + universe: Universe + + character: Character + location: Location + item: Item + + country: Country + creature: Creature + deity: Deity + flora: Flora + government: Government + group: Group + landmark: Landmark + language: Language + magic: Magic + planet: Planet + race: Race + religion: Religion + scene: Scene + technology: Technology + town: Town + + user: User + session: Session + + attributes: + character: + eyecolor: Eye color + facialhair: Facial hair + fave_animal: Favorite animal + fave_color: Favorite color + fave_food: Favorite food + fave_possession: Favorite possession + fave_weapon: Favorite weapon + haircolor: Hair color + identmarks: Identifying marks + + location: + map: Map + + creature: + name: Name + description: Description + type_of: Type of creature + other_names: Other names + + religion: + practicing_locations: Locations + + flora: + magics: Magical effects + creatures: Eaten by + locations: Locations found + + scene: + scene_characters: Characters in scene + scene_locations: Locations in scene + scene_items: Items in scene + + serendipitous_questions: + attributes: + universe: + history: What is %{name}’s history? + description: How would you describe %{name}? + laws_of_physics: What are the laws of physics like in %{name}? + magic_system: What is the magic system like in %{name}? + technologies: What is the level of technology like in %{name}? + + character: + age: How old is %{name}? + aliases: What other aliases does %{name} go by? + background: What is %{name}’s background? + birthday: When is %{name}’s birthday? + #birthplace: Where was %{name} born? + bodytype: What is %{name}’s body type? + description: Describe %{name}. + education: What is %{name}’s level of education? + eyecolor: What is %{name}’s eye color? + facialhair: What facial hair does %{name} have? + fave_animal: What is %{name}’s favorite animal? + fave_color: What is %{name}’s favorite color? + fave_food: What is %{name}’s favorite food? + fave_possession: What is %{name}’s favorite possession? + fave_weapon: What is %{name}’s favorite weapon? + flaws: What flaws does %{name} have? + gender: What is %{name}’s gender? + haircolor: What color is %{name}’s hair? + hairstyle: How does %{name} style their hair? + height: How tall is %{name}? + hobbies: What hobbies does %{name} have? + identmarks: What identifying marks does %{name} have? + mannerisms: What mannerisms does %{name} have? + motivations: What motivates %{name} most? + name: What is %{name}’s full name? + occupation: What is %{name}’s occupation? + pets: What pets does %{name} have? + politics: What politics does %{name} have? + prejudices: What prejudices does %{name} have? + race: What is %{name}’s race? + religion: What religion does %{name} practice? + role: What is %{name}’s role in your story? + skintone: What skin tone does %{name} have? + talents: What talents does %{name} have? + weight: How much does %{name} weigh? + + item: + #current_owner: Who currently owns %{name}? + description: Describe %{name}. + item_type: What type of item is %{name}? + #made_by: Who made %{name}? + magic: What kind of magic does %{name} possess? + materials: What is %{name} made out of? + name: What is %{name}’s full name? + #original_owner: Who originally owned %{name}? + #past_owners + weight: How much does %{name} weigh? + year_made: When was %{name} made? + + location: + area: What kind of area is %{name} in? + #capital: What is %{name}’s capital? + climate: What is the climate like in %{name}? + crops: What crops does %{name} produce? + currency: What currencies are used in %{name}? + established_year: When was %{name} established? + founding_story: How was %{name} founded? + language: What languages are spoken in %{name}? + #largest_city: What is %{name}’s largest city? + laws: What are the laws in %{name}? + located_at: Where is %{name} located? + motto: What is %{name}’s motto? + #notable_cities: What notable cities are located in %{name}? + notable_wars: What notable wars has %{name} been involved in? + population: What is %{name}’s population? + sports: What sports are played in %{name}? + type_of: What type of location is %{name}? + + description: Describe %{name}. + name: What is %{name}’s full name? + + creature: + description: How would you describe a %{name}? + type_of: What type of creature is a %{name}? + other_names: What other names is a %{name} sometimes called? + + color: What colors does a %{name} come in? + shape: How would you describe the shape of a %{name}? + size: How big (or small) is the usual %{name}? + notable_features: What physical features are most notable for a %{name}? + materials: What materials (feathers, scales, etc) is a %{name} made of? + + aggressiveness: How aggressive is the average %{name}? + attack_method: What methods does a %{name} use to attack? + defense_method: How does a %{name} defend itself from attackers? + maximum_speed: How fast can a %{name} move? + strengths: What are the notable strengths of a %{name}? + weaknesses: What are the notable weaknesses of a %{name}? + sounds: What sounds does a %{name} make? + spoils: When hunted, what spoils does a %{name} leave behind? + + preferred_habitat: What kind of habitat is best for a %{name}? + food_sources: Where does a %{name} find its food? + migratory_patterns: Does a %{name} have any migratory patterns? + reproduction: How does a %{name} reproduce? + herd_patterns: What herd patterns does a %{name} have? + + similar_animals: What other animals is a %{name} most like? + symbolisms: What symbolisms does the %{name} hold in your world? + + race: + description: How would you describe %{name} people? + other_names: What other names do %{name} have? + + body_shape: What does the average %{name} body shape look like? + skin_colors: What skin color(s) are common on the %{name} race? + height: How tall is the average %{name}? + weight: How heavy is the average %{name}? + notable_features: What physical features on a %{name} are most noticeable? + variance: How much variance is there between individuals of the %{name} race? + clothing: What kind of clothing is common with %{name} individuals? + + strengths: What are the strengths of %{name}? + weaknesses: What are the weaknesses of %{name}? + + traditions: What traditions are common with %{name} individuals? + beliefs: What beliefs are commonly held by the %{name}? + governments: What governments are common with the %{name}? + technologies: What kinds of technologies do the %{name} societies take advantage of? + occupations: What occupations are common with %{name} individuals? + economics: What does the economic situation look like for the %{name}? + favorite_foods: What are the most common favorite foods of the %{name}? + + notable_events: What events are most important to the %{name} past? + + religion: + description: How is %{name} usually described? + other_names: What other names is %{name} known by? + + origin_story: How did %{name} first come into existence? + teachings: What values does %{name} teach? + prophecies: What prophecies does %{name} teach? + places_of_worship: Where does %{name} worship happen? + worship_services: What kind of worship services are common with %{name}? + obligations: What kinds of obligations are required of those who practice %{name}? + paradise: What does the %{name} vision of paradise look like? + + initiation: What does the %{name} initiation process entail? + rituals: What rituals are common with %{name}? + holidays: What are the %{name} holidays? + + group: + description: How would you describe the %{name} group? + other_names: What other names is %{name} known by? + + motivation: What motivates %{name}? + goal: What is the primary goal of %{name}? + obstacles: What obstacles stand in the way of %{name}? + risks: What risks are on the line for %{name}? + + inventory: What kinds of items does %{name} keep in inventory? + + magic: + description: How would you describe %{name}? + type_of: What type of magic is %{name}? + + visuals: What do the visual effects of %{name} look like? + effects: What effects does %{name} have? + + positive_effects: What positive effects does %{name} have? + negative_effects: What negative effects does %{name} have? + neutral_effects: What neutral effects does %{name} have? + + element: What element is %{name} most closely aligned to? + + resource_costs: What resource costs are required to use %{name}? + materials: What materials are required to use %{name}? + skills_required: What skills are required to use %{name}? + limitations: What limitations does %{name} have? What can't it do? + + language: + other_names: What other names is %{name} known by? + + history: What is the history of %{name}? + #typology: + #dialetical_information: + #register: + + #phonology: + + #grammar: + + #numbers: + #quantifiers: + + flora: + name: What's the name of this flora? + description: How would you describe %{name}? + aliases: What other names is %{name} known by? + + colorings: What kinds of colorings are found on %{name}? + size: How big does %{name} grow? + smell: What does %{name} smell like? + taste: What does %{name} taste like? + + fruits: What fruits does %{name} produce? + seeds: What kinds of seeds does %{name} produce? + nuts: What kinds of nuts does %{name} produce? + berries: What kinds of berries does %{name} produce? + medicinal_purposes: Does %{name} have any medicinal use? + + reproduction: How does %{name} reproduce and spread? + seasonality: What seasons or climates is %{name} most often found in? + + town: + name: What's the name of this town? + description: How would you describe %{name}? + other_names: What other names is %{name} known by? + + laws: What are the major laws in %{name}? + sports: What sports are popular in %{name}? + politics: What are the politics like in %{name}? + + founding_story: How was %{name} founded? + established_year: When was %{name} founded? + + landmark: + name: What's the name of this landmark? + description: How would you describe %{name}? + other_names: What other names is %{name} known by? + + size: How big is %{name}? + materials: What materials was %{name} constructed with? + colors: What color(s) is %{name}? + + creation_story: How did %{name} originate? + established_year: When did %{name} originate? + + country: + name: What's the name of this country? + description: How would you describe %{name}? + other_names: What other names is %{name} known by? + + population: What is the population of %{name}? + currency: What currency is used in %{name}? + laws: What are the major laws in %{name}? + sports: What sports are popular in %{name}? + + area: How big is %{name}? + crops: What crops does %{name} import or export? + climate: What is the climate like in %{name}? + + founding_story: How was %{name} founded? + established_year: When was %{name} founded? + notable_wars: What notable wars has %{name} participated in? + + technology: + name: What's the name of this technology? + description: How would you describe %{name}? + other_names: What other names is %{name} known by? + + materials: What materials is %{name} made with? + manufacturing_process: How is %{name} produced and manufactured? + sales_process: How is %{name} sold? + cost: How much does %{name} cost? + + rarity: How rare (or common) is %{name}? + + purpose: What is %{name} used for? + how_it_works: How does %{name} work? + resources_used: What resources does %{name} use? + + physical_description: What does %{name} look like? + size: How big is the average %{name}? + weight: How much does the average %{name} weigh? + colors: What colors are the average %{name}? + + planet: + name: What's the name of %{name}? + description: How would you describe %{name}? + + size: How big is %{name}? + surface: What is the surface of %{name} like? + climate: What's the climate on %{name} like? + weather: What's the weather like on %{name}? + water_content: What's the water content like on %{name}? + natural_resources: What natural resources are there on %{name}? + + length_of_day: How long is daytime on %{name}? + length_of_night: How long is night time on %{name}? + calendar_system: What's the calendar system like on %{name}? + + population: What's the population like on %{name}? + + moons: Does %{name} have moons? If so, what are they? + orbit: What does %{name}'s astral orbit look like? + visible_constellations: What constellations are visible from %{name}? + + first_inhabitants_story: How did the first inhabitants arrive on this planet? + world_history: What is the world history of %{name}? + + government: + name: What's the name of %{name}? + description: How would you describe %{name}? + + type_of_government: What type of government is %{name}? + power_structure: How is %{name}'s power structured? How is it organized? Who has what powers? + power_source: Where does %{name}'s source of power come from? + checks_and_balances: What checks and balances does %{name} have in place? + + sociopolitical: What sociopolitical ideologies does %{name} hold? + socioeconomical: What socioeconomical ideologies does %{name} hold? + geocultural: What geocultural ideologies does %{name} hold? + laws: What are the laws of %{name}? + immigration: What immigration policies and ideologies does %{name} hold? + privacy_ideologies: What does %{name} think about privacy? + + electoral_process: What is the electoral process of %{name}? + term_lengths: What are the term lengths for people in %{name}? + criminal_system: What is %{name}'s criminal system like? + + approval_ratings: What do the people think of %{name}? What are their approval ratings? + international_relations: What do international governments think about %{name}? How are their relations? + civilian_life: What is civilian life like for the people ruled by %{name}? + + military: What does %{name}'s military look like? + navy: What does %{name}'s navy look like? + airforce: What does %{name}'s airforce look like? + space_program: Does %{name} have a space program? What is it like? + + founding_story: How was %{name} created? What is its founding story? + flag_design_story: How was %{name}'s flag designed? + notable_wars: What notable wars throughout history has %{name} been involved in? + + deity: + name: What is %{name}'s name? + description: How would you describe %{name}? + other_names: What other names is %{name} known by? + + physical_description: How would you describe what %{name} looks like physically? + height: How tall is %{name}? + weight: How much does %{name} weigh? + + symbols: What symbols are commonly associated with %{name}? + elements: What elements are commonly associated with %{name}? + + strengths: What are %{name}'s strengths? + weaknesses: What are %{name}'s weaknesses? + + prayers: What prayers are commonly associated with %{name}? How do followers pray? + rituals: What rituals are commonly associated with %{name}? How do they work? + human_interaction: How often does %{name} interact with their followers? In what ways? + + notable_events: What notable events throughout history has %{name} been a part of? + family_history: What is %{name}'s family history? + life_story: What is %{name}'s life story? + + blacklist: + _: + - id + - user_id + - privacy + location: + - map_content_type + - map_file_name + - map_file_size + - map_updated_at + + content_oneliners: + universe: Encapsulate your worlds + character: The souls of your world + location: A world of possibilities + item: Every item has a story + country: Kingdoms, countries, and regions + creature: Your personal bestiary + deity: Gods, goddesses, and celestial beings + flora: The plants and nature of your world + government: The governments of your world + group: From fellowships to organizations + landmark: Statues, caves, peaks, and more + language: Design your own languages + magic: Spells, potions, and other magical things + planet: Planets, separated by space + race: The melting pot of cultures + religion: What do your characters believe in? + scene: Create scenes to organize a plot + technology: Gadgets, gizmos, and advanced technology + town: Civilization's establishments + + content_descriptions: + universe: > + Track multiple stories simultaneously by organizing your ideas into just the universe they + belong in. + character: > + From your heroes to the little guys that live in the background, everyone plays a role in strong + stories. + location: > + From magical mountains to urban modern settings, locations are the + lifeblood of worldbuilding. + item: > + Track books, weapons, artifacts, and other items in your world: who made them, owns them, and more. + creature: > + Your personal bestiary includes the wildlife, critters, merfolk, and other interesting beings of + your world. + race: > + Humans are often joined by elves, orcs, werewolves, vampires, dragons, and a myriad of other races. + religion: > + Organizing your world's beliefs into cohesive religions can lead to a more epic world for your readers. + group: > + Use groups to bundle your characters, locations, items, or other ideas into any kind of collection + you need. + magic: > + Often a source of magic creates a multitude of spells, potions, and occasional trinkets. + language: > + Language is the bond that weaves a culture's words together. Are there any new languages in your world? + flora: > + The plants, flowers, trees, and other nature in your world. Paint your landscape with rich flora. + town: > + Towns across the country are pockets of interesting life, filled with characters and more. + country: > + Kingdoms, countries, regions, and more. Huge swathes of land are often claimed quickly. + landmark: > + From the smallest statue to the biggest mountain, landmarks are littered across the land. + scene: > + Scenes are events that happen in your world, ranging in size from a nice breakfast to entire wars. + planet: > + Celestial bodies orbiting through space, carrying a planet's-worth of worldbuilding on them. + deity: > + Gods, goddesses, and other godly beings in your world — every world came from somewhere. + government: > + The organizations of your world that keep it running smoothly (or not): governments. + technology: > + Create your gadgets, gizmos, and all kinds of advanced (or primitive) technologies. + attributefield: > + Attributes can be anything you need to define just the detail you need. Select the type of content + you're describing and setup any number of attributes to do the job. + attributecategory: > + Attribute Categories are groupings of attributes you can attach to any specified resource. Each of the + tabs across the top of a notebook page are examples of an attribute category. + + create_success: "%{model_name} was successfully created." + update_success: "%{model_name} was successfully updated." + delete_success: "%{model_name} was successfully deleted." + + location_create_upload_map_error: > + Location was created, but your map did not upload. Please try again. + + location_update_upload_map_error: > + Location was updated, but your map did not upload. Please try again. + + thredded: + nav: + all_messageboards: Notebook.ai Forums + settings: Settings + private_topics: Inbox + search: + form: + placeholder: Search Discussions + preferences: + global_preferences_title: Preferences + messageboard_preferences_nav_title: Per-category Settings + messageboard: + create: Create a New Discussion Board + topics_and_posts_counts: "%{topics_count} threads / %{posts_unread} unread" + last_updated_by_html: "%{user} commented %{time_ago}" + index: + page_title: Discussions + topics: + follow: Follow this discussion + form: + create_btn: Create New Discussion + title_placeholder_start: Start a New Discussion + following: + auto: You are following this discussion because auto-follow is enabled. + manual: You are following this discussion. + mentioned: You are following this discussion because you were mentioned on it. + posted: You are following this discussion because you posted to it. + posts: + delete: Delete reply + delete_confirm: Are you sure you want to delete this reply? + deleted_notice: Your reply has been deleted. + form: + create_btn: Post reply + title_label: Reply to this discussion + + body_types: + - Delicate + - Flat + - Fragile + - Lean + - Lightly muscled + - Small-shouldered + - Thin + - Athletic + - Hourglass + - Bodybuilder + - Rectangular + - Muscular + - Thick-skinned + - Big-boned + - Round physique + - Pear-shaped + + eye_colors: + - Amber + - Black + - Arctic blue + - Baby blue + - China blue + - Cornflower blue + - Crystal blue + - Denim blue + - Electric blue + - Indigo + - Sapphire blue + - Sky blue + - Champagne brown + - Chestnut brown + - Chocolate brown + - Golden brown + - Honey brown + - Topaz + - Charcoal grey + - Cloudy grey + - Steel grey + - Chartreuse + - Emerald green + - Forest green + - Grass green + - Jade green + - Leaf green + - Sea green + - Hazel + - Amethyst + - Hyacinth + - Ultramarine blue + - One green, one blue + - One blue, one brown + - One brown, one blue + - One brown, one green + - Light violet + - Dark violet + + facial_hair_styles: + - Beard, long + - Beard, short + - Chin curtain + - Chinstrap + - Fu Manchu, short + - Fu Manchu, long + - Goatee + - Handlebar mustache + - Horseshoe mustache + - Mustache + - Mutton chops, thin + - Mutton chops, thick + - Neckbeard + - Pencil mustache + - Shenandoah + - Sideburns + - Soul patch + - Light stubble + - Thick stubble + - Toothbrush mustache + - Van Dyke beard + - Patchy beard + - Patchy mustache + + hair_colors: + - Blonde + - Black + - Brown + - Red + - Bald + - White + - Grey + - Balding + - Greying + - Bleached + - Blue + - Green + - Purple + - Orange + - Auburn + - Strawberry + - Chestnut + - Dirty Blonde + - Rainbow + - Black tips + - Jet black + - Raven black + + hair_styles: + - Afro + - Bald + - Balding + - Bob cut + - Bowl cut + - Bouffant + - Braided + - Bun + - Butch + - Buzz cut + - Chignon + - Chonmage + - Comb over + - Cornrows + - Crew cut + - Dreadlocks + - Emo + - Fauxhawk + - Feathered + - Flattop + - Fringe + - Liberty Spikes + - Long hair, straight + - Long hair, curly + - Long hair, wavy + - Mohawk + - Mop-top + - Odango + - Pageboy + - Parted + - Pigtails + - Pixie cut + - Pompadour + - Ponytail + - Rattail + - Rocker + - Slicked back + - Spiky, short + - Spiky, long + - Short, curly + - Short, wavy + - Short, thin + - Short, straight + + identifying_marks: + - minor scar + - large scar + - mole + - fleshy growth + - tattoo + - discoloration + + on_the: on the + + identifying_mark_locations: + - left eye + - right eye + - left thigh + - right thigh + - left shin + - right shin + - left foot + - right foot + - big toe + - hip + - stomach + - lower back + - chest + - upper back + - left shoulder + - right shoulder + - left bicep + - right bicep + - left tricep + - right tricep + - left hand + - right hand + - pointer finger + - thumb + - neck + - scalp + - above lip + - nose + - left ear + - right ear + - forehead + - left cheek + - right cheek + - left temple + - right temple + - chin + - beneath chin + + male_first_names: + - James + - John + - Robert + - Michael + - William + - David + - Richard + - Charles + - Joseph + - Thomas + - Christopher + - Daniel + - Paul + - Mark + - Donald + - George + - Kenneth + - Steven + - Edward + - Brian + - Ronald + - Anthony + - Kevin + - Jason + - Matthew + - Gary + - Timothy + - Jose + - Larry + - Jeffrey + - Frank + - Scott + - Eric + - Stephen + - Andrew + - Raymond + - Gregory + + female_first_names: + - Mary + - Patricia + - Linda + - Barbara + - Elizabeth + - Jennifer + - Maria + - Susan + - Margaret + - Margret + - Dorothy + - Lisa + - Nancy + - Karen + - Betty + - Helen + - Sandra + - Donna + - Carol + - Ruth + - Sharon + - Michelle + - Laura + - Sarah + - Kimberly + - Deborah + - Jessica + - Shirley + - Cynthia + - Angela + - Melissa + - Brenda + - Amy + - Anna + - Rebecca + - Virginia + - Kathleen + - Pamela + + last_names: + - Smith + - Brown + - Lee + - Wilson + - Martin + - Patel + - Taylor + - Wong + - Campbell + - Williams + - Thompson + - Jones + - Johnson + - Miller + - Davis + - Garcia + - Rodriguez + - Martinez + - Anderson + - Jackson + - White + - Green + - Lee + - Harris + - Clark + - Lewis + - Robinson + - Walker + - Hall + - Young + - Allen + - Sanchez + - Wright + - King + - Scott + - Roberts + - Carter + - Phillips + - Evans + - Turner + - Torres + - Parker + - Collins + - Stewart + - Flores + - Morris + - Nguyen + - Murphy + - Rivera + - Cook + - Morgan + - Peterson + - Cooper + - Gomez + - Ward + + character_races: + - Android + - Angel + - Animal + - Arachnoid + - Bird + - Construct + - Dark Elf + - Dwarf + - Elemental + - Elf + - Fairy + - Fey + - Genie + - Gnome + - Half-Dwarf + - Half-Elf + - Half-Orc + - Halfling + - Human + - Insectoid + - Orc + - Reptilian + - Robot + - Spirit + - Vampire + - Werewolf + + skin_tones: + - Albino + - Light + - Pale white + - Fair + - White + - Medium + - Olive + - Moderate brown + - Brown + - Dark brown + - Chocolate + - Black + - Grey + - Green + - Blue + - Red + - Jet black + - Raven black + + archetypes: + - Anthropomorphic Personification + - Anti-Hero + - Archmage + - Barefoot Sage + - Big Fun + - Blind Seer + - Blue-Collar Warlock + - Bruiser with a Soft Center + - The Champion + - The Chosen One + - The Chooser of The One + - Classic Villain + - The Cynic + - The Dragonslayer + - The Drunken Sailor + - Dumb Muscle + - Eccentric Mentor + - Enigmatic Empowering Entity + - Evil Overlord + - The Fair Folk + - Father Neptune + - Ferryman + - The Fool + - Fool for Love + - Gentle Giant + - The Good King + - Granny Classic + - The Grotesque + - Herald + - Heroic Archetype + - Heroic Wannabe + - The High Queen + - Higher Self + - The Hunter + - Ideal Hero + - The Idealist + - Ineffectual Loner + - The Kirk + - The Klutz + - Knight in Shining Armor + - Lady and Knight + - Loser Archetype + - Lovable Rogue + - Magical Barefooter + - Mary Sue + - The McCoy + - Mentor + - Messianic + - Mixed + - Mock Millionaire + - Modern Major General + - My Girl Back Home + - Obstructive Bureaucrat + - Oedipus Complex + - Old Soldier + - The Paladin + - The Patriarch + - Person of Mass Destruction + - The Pollyanna + - Powers That Be + - Prince Charming + - Princess Classic + - A Protagonist Shall Lead Them + - Rebel Leader + - Rebellious Spirit + - Reluctant Monster + - Satanic Archetype + - Seeker Archetype + - Shadow Archetype + - Shapeshifter + - The Spock + - Star-Crossed Lovers + - The Storyteller + - Threshold Guardians + - Turn Coat + - The Trickster + - Visitor + - Wicked Stepmother + - Wicked Witch + - Wizard Classic + - Wolf Man + - World's Best Warrior + - World's Most Beautiful Woman + - World's Strongest Man + + location_name_prefixes: + - New + - Los + - Fort + - City of + - El + - Saint + - Des + - Little + - Big + - North + - East + - South + - West + - Round + - The + - Broken + - Santa + + location_name_suffixes: + - Port + - City + - Grove + - Pines + - Falls + - Heights + - Oaks + - Rapids + - Valley + - Mountains + - Peaks + - Arbor + - Mesa + - Gardens + - Palms + - Beach + - Bend + - Ruins + + location_name_syllables: + - lo + - chi + - ca + - go + - hou + - ston + - nix + - pho + - an + - ant + - ton + - io + - san + - die + - dia + - dal + - las + - son + - vil + - pol + - ral + - polis + - na + - aus + - tin + - fran + - cis + - co + - col + - umb + - bus + - cha + - mem + - phis + - sea + - wor + - the + - tha + - den + - was + - bal + - ti + - mo + - ash + - wau + - kee + - ki + - ru + - lu + - cest + - pro + - ora + - ode + - mu + - ill + - ville + - vil + + shield_types: + - Greek aspis + - Buckler + - Heater shield + - Heraldic shield + - Leather shield + - Hide shield + - Hoplon shield + - Kite shield + - Scutum + - Targe + + weapon_types: + - Bastard sword + - Battleaxe + - Bolas + - Bow & Arrow + - Bowstaff + - Brass knuckles + - Broom + - Chainsaw + - Club + - Dagger + - Darts + - Falchion + - Flail + - Gauntlet + - Glaive + - Greataxe + - Greatsword + - Halberd + - Handaxe + - Hand crossbow + - Heavy crossbow + - Javelin + - Kama + - Kukri + - Lance + - Longbow + - Longsword + - Madu + - Morningstar + - Net + - Nunchaku + - Pocket knife + - Quarterstaff + - Ranseur + - Rapier + - Repeating crossbow + - Sai + - Sap + - Scimitar + - Scythe + - Shortsword + - Shortbow + - Shortspear + - Shuriken + - Siangham + - Sickle + - Sling + - Spear + - Throwing axe + - Trident + - Warhammer + - Whip + + axe_types: + - Bardiche + - Battleaxe + - Broadaxe + - Handaxe + - Hatchet + - Long-bearded axe + - Tomahawk + + bow_types: + - Longbow + - Sling + - Blowgun + - Flatbow + - Composite bow + - Yumi + - Gungdo + - Shortbow + - Arbalest + - Crossbow + - Repeating crossbow + + club_types: + - Boomerang + - Frying pan + - Hammer + - Brick + - Mace + - Morningstar + - Sai + - Scepter + - Sledgehammer + - Lamp + - Glass bottle + - Warhammer + - Wrench + - Crowbar + + fist_weapon_types: + - Bahh nakh, tiger claws + - Brass knuckles + - Cestus + - Deer horn knives + - Finger knife + - Gauntlets + - Katar + - Korean fan + - Madu, buckhorn stick + - Pata sword gauntlet + - Push dagger + - Roman scissor + - War fan + - Wind and fire wheels + - Emei daggers + - Large stone + - Brick + + flexible_weapon_types: + - Bullwhip + - Cat o' nine tails + - Chain whip + - Lasso + - Nunchaku + - Flail + - Meteor hammer + + thrown_weapon_types: + - Harpoon + - Bolas + - Javelin + - Pilum + - Woomera + - Angon + - Chakram + - Kunai + - Boomerang + - Throwing knife + - Thrown darts + - Swiss arrow + - Francisca + - Tomahawk + - Shuriken + - Stones + + polearm_types: + - Bo + - Taiji staff + - Quarterstaff + - Staff + - Spear + - Lance + - Pike + - Pitchfork + - Qiang + - Ranseur + - Spetum + - Swordstaff + - Trident + - Bardiche + - Bill + - Glaive + - Halberd + - Lochaber axe + - Naginata + - Partizan + - Scythe + - Voulge + - War scythe + + shortsword_types: + - Dagger + - Fireplace poker + - Small sword + - Xiphos shortsword + - Aikuchi shortsword + - Kodachi shortsword + - Pinuti shortsword + - Wakizashi shortsword + + sword_types: + - Cutlass + - Dao + - Dha + - Falchion + - Hunting sword + - Kukri + - Pulwar + - Sabre + - Scimitar + - Shamshir + - Talwar + - Epee + - Flamberge + - Longsword + - Ninjato + - Rapier + - Katana + - Claymore + - Dadao + - Executioner's sword + - Flambard + - Greatsword + - Nodachi + - Falcata + - Machete + - Yatagan + + other_item_types: + - Book + - Scroll + - Relic + - Artifact + - Plot device + - Hat + - Stone + - Material From 01f58d99b8e66bee96213ab04fdbf967ed9b643f Mon Sep 17 00:00:00 2001 From: Tristan Date: Wed, 4 Jul 2018 20:48:40 -0500 Subject: [PATCH 04/26] restore routes --- config/routes.rb | 285 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 240 insertions(+), 45 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 3f66539d..f20b1786 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,56 +1,251 @@ +# rubocop:disable LineLength + Rails.application.routes.draw do - # The priority is based upon order of creation: first created -> highest priority. - # See how all your routes lay out with "rake routes". + get 'customization/content_types' + post 'customization/toggle_content_type' - # You can have the root of your site routed with "root" - # root 'welcome#index' + devise_for :users, :controllers => { registrations: 'registrations' } + resources :users do + get :characters, on: :member + get :locations, on: :member + get :items, on: :member + get :creatures, on: :member + get :races, on: :member + get :religions, on: :member + get :magics, on: :member + get :languages, on: :member + get :floras, on: :member + get :towns, on: :member + get :countries, on: :member + get :landmarks, on: :member + get :scenes, on: :member + get :groups, on: :member + get :universes, on: :member + get :planets, on: :member + get :technologies, on: :member + get :deities, on: :member + get :governments, on: :member + # + end - # Example of regular route: - # get 'products/:id' => 'catalog#view' + delete 'contributor/:id/remove', to: 'contributors#destroy', as: :remove_contributor - # Example of named route that can be invoked with purchase_url(id: product.id) - # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase + get '/unsubscribe/emails/:code', to: 'emails#one_click_unsubscribe' - # Example resource route (maps HTTP verbs to controller actions automatically): - # resources :products + # Main pages + root to: 'main#index' - # Example resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end + # Info pages + scope '/about' do + #get '/notebook', to: 'main#about_notebook', as: :about_notebook + get '/privacy', to: 'main#privacyinfo', as: :privacy_policy + end - # Example resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end + # Landing pages + scope '/for' do + get '/writers', to: 'main#for_writers', as: :writers_landing + get '/roleplayers', to: 'main#for_roleplayers', as: :roleplayers_landing + get '/designers', to: 'main#for_designers', as: :designers_landing - # Example resource route with more complex sub-resources: - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', on: :collection - # end - # end + get '/friends', to: 'main#for_friends', as: :friends_landing + end - # Example resource route with concerns: - # concern :toggleable do - # post 'toggle' - # end - # resources :posts, concerns: :toggleable - # resources :photos, concerns: :toggleable + scope '/vote' do + get '/community', to: 'main#feature_voting', as: :community_voting + get '/:id', to: 'voting#vote', as: :cast_vote + end - # Example resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end + # User-centric stuff + scope '/my' do + get '/content', to: 'main#dashboard', as: :dashboard + get '/content/recent', to: 'main#recent_content', as: :recent_content + get '/submissions', to: 'main#comingsoon' + get '/prompts', to: 'main#prompts', as: :prompts + get '/scratchpad', to: 'main#notes', as: :notes + + # Billing + scope '/billing' do + #get '/', to: 'subscriptions#show', as: :billing + get '/subscription', to: 'subscriptions#new', as: :subscription + + get '/to/:stripe_plan_id', to: 'subscriptions#change', as: :change_subscription + + get '/information', to: 'subscriptions#information', as: :payment_info + post '/information', to: 'subscriptions#information_change', as: :process_payment_info + + # This should probably be a DELETE + get '/payment_method/delete', to: 'subscriptions#delete_payment_method', as: :delete_payment_method + end + end + resources :documents + delete 'delete_my_account', to: 'users#delete_my_account' + + # Lab apps + scope '/app' do + # Navigator + get 'navigator', to: 'navigator#index' + + # Babel + get 'babel', to: 'lab#babel' + post 'babel', to: 'lab#babel' + + # Pinboard + get 'pinboard', to: 'lab#pinboard' + end + + # Sessions + get '/login', to: 'sessions#new', as: :login + post '/login', to: 'sessions#create', as: :login_process + get '/logout', to: 'sessions#destroy', as: :logout + + # Planning + scope '/plan' do + # Core content types + resources :universes do + get :characters, on: :member + get :locations, on: :member + get :items, on: :member + get :creatures, on: :member + get :races, on: :member + get :religions, on: :member + get :magics, on: :member + get :languages, on: :member + get :floras, on: :member + get :scenes, on: :member + get :groups, on: :member + get :countries, on: :member + get :towns, on: :member + get :landmarks, on: :member + get :planets, on: :member + get :technologies, on: :member + get :deities, on: :member + get :governments, on: :member + # + end + resources :characters do + get :autocomplete_character_name, on: :collection, as: :autocomplete_name + end + resources :items + resources :locations do + get :autocomplete_location_name, on: :collection, as: :autocomplete_name + end + + # Extended content types + resources :creatures + resources :races + resources :religions + resources :magics + resources :languages + resources :floras + resources :towns + resources :countries + resources :landmarks + resources :scenes + resources :groups + resources :planets + resources :technologies + resources :deities + resources :governments + # + + # Content attributes + resources :attributes + resources :attribute_categories + resources :attribute_fields + + # Image handling + delete '/delete/image/:id', to: 'image_upload#delete', as: :image_deletion + + # Coming Soon TM + get '/plots', to: 'main#comingsoon' + end + get 'search/', to: 'search#results' + + scope 'admin' do + get '/', to: 'admin#dashboard', as: :admin_dashboard + get '/content_type/:type', to: 'admin#content_type', as: :admin_content_type + + get '/attributes', to: 'admin#attributes', as: :admin_attributes + end + + scope 'export' do + get '/', to: 'export#index', as: :notebook_export + + get '/outline', to: 'export#outline', as: :notebook_outline + get '/notebook.json', to: 'export#notebook_json', as: :notebook_json + get '/notebook.xml', to: 'export#notebook_xml', as: :notebook_xml + get '/:model.csv', to: 'export#csv', as: :notebook_csv + end + + scope '/scene/:scene_id' do + get 'editor', to: 'write#editor' + end + + # API Endpoints + scope '/generate' do + # General information + + # Character information + scope '/character' do + get '/age', to: 'characters_generator#age' + get '/bodytype', to: 'characters_generator#bodytype' + get '/eyecolor', to: 'characters_generator#eyecolor' + get '/facial-hair', to: 'characters_generator#facialhair' + get '/haircolor', to: 'characters_generator#haircolor' + get '/hairstyle', to: 'characters_generator#hairstyle' + get '/height', to: 'characters_generator#height' + get '/identifying-mark', to: 'characters_generator#identifyingmark' + get '/name', to: 'characters_generator#name' + get '/race', to: 'characters_generator#race' + get '/skintone', to: 'characters_generator#skintone' + get '/weight', to: 'characters_generator#weight' + end + + # Location information + scope '/location' do + get '/name', to: 'locations_generator#name' + end + + # Equipment location + scope '/equipment' do + scope '/weapon' do + get '/', to: 'equipment_generator#weapon' + + get '/axe', to: 'equipment_generator#weapon_axe' + get '/bow', to: 'equipment_generator#weapon_bow' + get '/club', to: 'equipment_generator#weapon_club' + get '/fist', to: 'equipment_generator#weapon_fist' + get '/flexible', to: 'equipment_generator#weapon_flexible' + # TODO: /gun + get '/polearm', to: 'equipment_generator#weapon_polearm' + get '/shortsword', to: 'equipment_generator#weapon_shortsword' + get '/sword', to: 'equipment_generator#weapon_sword' + get '/thrown', to: 'equipment_generator#weapon_thrown' + end + + scope '/armor' do + get '/', to: 'equipment_generator#armor' + + get '/shield', to: 'equipment_generator#armor_shield' + end + end + end + + # Adoption Agency + scope '/adoption' do + get '/', to: 'main#comingsoon' + end + + # Idea Market + scope '/market' do + get '/', to: 'main#comingsoon' + end + + # get '/forum', to: 'emergency#temporarily_disabled' + # get '/forum/:wildcard', to: 'emergency#temporarily_disabled' + # get '/forum/:wildcard/:another', to: 'emergency#temporarily_disabled' + mount Thredded::Engine => '/forum' + mount StripeEvent::Engine, at: '/webhooks/stripe' end + +# rubocop:enable LineLength From dea2d24e9be27952cf57d06e090ebd01204baf84 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Wed, 4 Jul 2018 20:58:12 -0500 Subject: [PATCH 05/26] Check in .tool-versions --- .tool-versions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index dcacdebe..626b4594 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1,2 @@ -ruby 2.3.0 +ruby 2.5.1 + From f6d80346dfa23a29046c08d3f77771e29fa401e8 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Wed, 4 Jul 2018 21:01:14 -0500 Subject: [PATCH 06/26] thredded migrations --- db/schema.rb | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/db/schema.rb b/db/schema.rb index 329940ca..09bda0bd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1350,6 +1350,43 @@ ActiveRecord::Schema.define(version: 20180620012919) do t.datetime "updated_at", null: false end + create_table "page_categories", force: :cascade do |t| + t.string "label" + t.integer "universe_id" + t.string "content_type" + t.string "icon" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "user_id" + end + + add_index "page_categories", ["universe_id", "content_type"], name: "index_page_categories_on_universe_id_and_content_type" + add_index "page_categories", ["universe_id"], name: "index_page_categories_on_universe_id" + add_index "page_categories", ["user_id"], name: "index_page_categories_on_user_id" + + create_table "page_field_values", force: :cascade do |t| + t.integer "page_field_id" + t.integer "page_id" + t.text "value" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.datetime "deleted_at" + end + + add_index "page_field_values", ["page_field_id"], name: "index_page_field_values_on_page_field_id" + add_index "page_field_values", ["user_id"], name: "index_page_field_values_on_user_id" + + create_table "page_fields", force: :cascade do |t| + t.string "label" + t.integer "page_category_id" + t.string "field_type", default: "textarea" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "page_fields", ["page_category_id"], name: "index_page_fields_on_page_category_id" + create_table "past_ownerships", force: :cascade do |t| t.integer "user_id" t.integer "item_id" From 59904a861dc0d2b6aee91ab3eddb149614c6396a Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 5 Jul 2018 01:10:52 -0500 Subject: [PATCH 07/26] rails 5 prep --- app/models/application_record.rb | 3 +++ app/models/attribute.rb | 2 +- app/models/attribute_category.rb | 2 +- app/models/attribute_field.rb | 2 +- app/models/billing_plan.rb | 2 +- app/models/content_change_event.rb | 2 +- app/models/content_groupers/archenemyship.rb | 2 +- app/models/content_groupers/artifactship.rb | 4 ++-- app/models/content_groupers/best_friendship.rb | 2 +- app/models/content_groupers/birthing.rb | 2 +- app/models/content_groupers/capital_cities_relationship.rb | 2 +- app/models/content_groupers/character_birthtown.rb | 2 +- app/models/content_groupers/character_companion.rb | 2 +- app/models/content_groupers/character_enemy.rb | 2 +- app/models/content_groupers/character_flora.rb | 2 +- app/models/content_groupers/character_friend.rb | 2 +- app/models/content_groupers/character_item.rb | 2 +- app/models/content_groupers/character_love_interest.rb | 2 +- app/models/content_groupers/character_magic.rb | 2 +- app/models/content_groupers/character_technology.rb | 2 +- app/models/content_groupers/childrenship.rb | 2 +- app/models/content_groupers/country_creature.rb | 2 +- app/models/content_groupers/country_flora.rb | 2 +- app/models/content_groupers/country_government.rb | 2 +- app/models/content_groupers/country_landmark.rb | 2 +- app/models/content_groupers/country_language.rb | 2 +- app/models/content_groupers/country_location.rb | 2 +- app/models/content_groupers/country_religion.rb | 2 +- app/models/content_groupers/country_town.rb | 2 +- app/models/content_groupers/creature_relationship.rb | 2 +- app/models/content_groupers/current_ownership.rb | 2 +- app/models/content_groupers/deity_ability.rb | 2 +- app/models/content_groupers/deity_character_child.rb | 2 +- app/models/content_groupers/deity_character_parent.rb | 2 +- app/models/content_groupers/deity_character_partner.rb | 2 +- app/models/content_groupers/deity_character_sibling.rb | 2 +- app/models/content_groupers/deity_creature.rb | 2 +- app/models/content_groupers/deity_deity_child.rb | 2 +- app/models/content_groupers/deity_deity_parent.rb | 2 +- app/models/content_groupers/deity_deity_partner.rb | 2 +- app/models/content_groupers/deity_deity_sibling.rb | 2 +- app/models/content_groupers/deity_flora.rb | 2 +- app/models/content_groupers/deity_race.rb | 2 +- app/models/content_groupers/deity_related_landmark.rb | 2 +- app/models/content_groupers/deity_related_town.rb | 2 +- app/models/content_groupers/deity_relic.rb | 2 +- app/models/content_groupers/deity_religion.rb | 2 +- app/models/content_groupers/deityship.rb | 2 +- app/models/content_groupers/famous_figureship.rb | 2 +- app/models/content_groupers/fathership.rb | 2 +- app/models/content_groupers/flora_eaten_by.rb | 2 +- app/models/content_groupers/flora_location.rb | 2 +- app/models/content_groupers/flora_magical_effect.rb | 2 +- app/models/content_groupers/flora_relationship.rb | 2 +- app/models/content_groupers/government_creature.rb | 2 +- app/models/content_groupers/government_group.rb | 2 +- app/models/content_groupers/government_item.rb | 2 +- app/models/content_groupers/government_leader.rb | 2 +- app/models/content_groupers/government_political_figure.rb | 2 +- app/models/content_groupers/government_technology.rb | 2 +- app/models/content_groupers/group_allyship.rb | 4 ++-- app/models/content_groupers/group_clientship.rb | 4 ++-- app/models/content_groupers/group_creature.rb | 2 +- app/models/content_groupers/group_enemyship.rb | 4 ++-- app/models/content_groupers/group_equipmentship.rb | 4 ++-- app/models/content_groupers/group_leadership.rb | 4 ++-- app/models/content_groupers/group_locationship.rb | 4 ++-- app/models/content_groupers/group_membership.rb | 4 ++-- app/models/content_groupers/group_rivalship.rb | 4 ++-- app/models/content_groupers/group_suppliership.rb | 4 ++-- app/models/content_groupers/headquartership.rb | 4 ++-- app/models/content_groupers/item_magic.rb | 2 +- app/models/content_groupers/key_itemship.rb | 4 ++-- app/models/content_groupers/landmark_country.rb | 2 +- app/models/content_groupers/landmark_creature.rb | 2 +- app/models/content_groupers/landmark_flora.rb | 2 +- app/models/content_groupers/landmark_nearby_town.rb | 2 +- app/models/content_groupers/largest_cities_relationship.rb | 2 +- app/models/content_groupers/lingualism.rb | 4 ++-- app/models/content_groupers/location_capital_town.rb | 2 +- app/models/content_groupers/location_landmark.rb | 2 +- app/models/content_groupers/location_languageship.rb | 2 +- app/models/content_groupers/location_largest_town.rb | 2 +- app/models/content_groupers/location_leadership.rb | 2 +- app/models/content_groupers/location_notable_town.rb | 2 +- app/models/content_groupers/magic_deityship.rb | 4 ++-- app/models/content_groupers/maker_relationship.rb | 2 +- app/models/content_groupers/marriage.rb | 2 +- app/models/content_groupers/mothership.rb | 2 +- app/models/content_groupers/notable_cities_relationship.rb | 2 +- app/models/content_groupers/officeship.rb | 4 ++-- app/models/content_groupers/original_ownership.rb | 2 +- app/models/content_groupers/past_ownership.rb | 2 +- app/models/content_groupers/planet_country.rb | 2 +- app/models/content_groupers/planet_creature.rb | 2 +- app/models/content_groupers/planet_deity.rb | 2 +- app/models/content_groupers/planet_flora.rb | 2 +- app/models/content_groupers/planet_group.rb | 2 +- app/models/content_groupers/planet_landmark.rb | 2 +- app/models/content_groupers/planet_language.rb | 2 +- app/models/content_groupers/planet_location.rb | 2 +- app/models/content_groupers/planet_nearby_planet.rb | 2 +- app/models/content_groupers/planet_race.rb | 2 +- app/models/content_groupers/planet_religion.rb | 2 +- app/models/content_groupers/planet_town.rb | 2 +- app/models/content_groupers/raceship.rb | 2 +- app/models/content_groupers/religious_figureship.rb | 2 +- app/models/content_groupers/religious_locationship.rb | 2 +- app/models/content_groupers/religious_raceship.rb | 4 ++-- app/models/content_groupers/scene_charactership.rb | 4 ++-- app/models/content_groupers/scene_itemship.rb | 4 ++-- app/models/content_groupers/scene_locationship.rb | 4 ++-- app/models/content_groupers/siblingship.rb | 2 +- app/models/content_groupers/sistergroupship.rb | 2 +- app/models/content_groupers/subgroupship.rb | 2 +- app/models/content_groupers/supergroupship.rb | 2 +- app/models/content_groupers/technology_character.rb | 2 +- app/models/content_groupers/technology_child_technology.rb | 2 +- app/models/content_groupers/technology_country.rb | 2 +- app/models/content_groupers/technology_creature.rb | 2 +- app/models/content_groupers/technology_group.rb | 2 +- app/models/content_groupers/technology_magic.rb | 2 +- app/models/content_groupers/technology_parent_technology.rb | 2 +- app/models/content_groupers/technology_planet.rb | 2 +- app/models/content_groupers/technology_related_technology.rb | 2 +- app/models/content_groupers/technology_town.rb | 2 +- app/models/content_groupers/town_citizen.rb | 2 +- app/models/content_groupers/town_country.rb | 2 +- app/models/content_groupers/town_creature.rb | 2 +- app/models/content_groupers/town_flora.rb | 2 +- app/models/content_groupers/town_group.rb | 2 +- app/models/content_groupers/town_language.rb | 2 +- app/models/content_groupers/town_nearby_landmark.rb | 2 +- app/models/content_groupers/wildlifeship.rb | 2 +- app/models/content_types/character.rb | 2 +- app/models/content_types/country.rb | 2 +- app/models/content_types/creature.rb | 2 +- app/models/content_types/deity.rb | 2 +- app/models/content_types/flora.rb | 2 +- app/models/content_types/government.rb | 2 +- app/models/content_types/group.rb | 2 +- app/models/content_types/item.rb | 2 +- app/models/content_types/landmark.rb | 2 +- app/models/content_types/language.rb | 2 +- app/models/content_types/location.rb | 2 +- app/models/content_types/magic.rb | 2 +- app/models/content_types/planet.rb | 2 +- app/models/content_types/race.rb | 2 +- app/models/content_types/religion.rb | 2 +- app/models/content_types/scene.rb | 2 +- app/models/content_types/technology.rb | 2 +- app/models/content_types/town.rb | 2 +- app/models/content_types/universe.rb | 2 +- app/models/contributor.rb | 2 +- app/models/document.rb | 2 +- app/models/image_upload.rb | 2 +- app/models/raffle_entry.rb | 2 +- app/models/referral.rb | 2 +- app/models/referral_code.rb | 2 +- app/models/stripe_event_log.rb | 2 +- app/models/subscription.rb | 2 +- app/models/user.rb | 2 +- app/models/user_content_type_activator.rb | 2 +- app/models/votable.rb | 2 +- app/models/vote.rb | 2 +- config/application.rb | 3 --- db/migrate/20140713043535_create_models.rb | 2 +- db/migrate/20150419134141_add_password_digest_to_users.rb | 2 +- db/migrate/20160405035806_add_devise_to_users.rb | 2 +- db/migrate/20160429190058_create_siblingships.rb | 2 +- db/migrate/20160503180503_create_fatherships.rb | 2 +- db/migrate/20160503183859_create_motherships.rb | 2 +- db/migrate/20160503192938_create_best_friendships.rb | 2 +- db/migrate/20160503193513_create_marriages.rb | 2 +- db/migrate/20160503193541_create_archenemyships.rb | 2 +- db/migrate/20160503201328_create_birthings.rb | 2 +- db/migrate/20160503205001_create_ownerships.rb | 2 +- db/migrate/20160806064053_create_childrenships.rb | 2 +- .../20160903220122_create_largest_cities_relationships.rb | 2 +- .../20160903221005_create_notable_cities_relationships.rb | 2 +- .../20160903221349_create_capital_cities_relationships.rb | 2 +- db/migrate/20160903221819_create_location_leaderships.rb | 2 +- db/migrate/20160903222311_create_original_ownership.rb | 2 +- db/migrate/20160903222537_create_current_ownership.rb | 2 +- db/migrate/20160903223957_create_maker_relationship.rb | 2 +- db/migrate/20160920180129_add_privacy_to_characters.rb | 2 +- db/migrate/20160922204302_add_privacy_to_items.rb | 2 +- db/migrate/20160922204317_add_privacy_to_locations.rb | 2 +- db/migrate/20161001232324_create_past_ownership.rb | 2 +- db/migrate/20161003000856_add_archetype_to_character.rb | 2 +- db/migrate/20161003183741_create_attributes.rb | 2 +- db/migrate/20161005111959_add_fields_to_universe.rb | 2 +- db/migrate/20161005115303_add_fields_to_character.rb | 2 +- db/migrate/20161005120615_add_fields_to_location.rb | 2 +- db/migrate/20161014204501_create_creatures.rb | 2 +- db/migrate/20161014210509_add_user_id_to_creatures.rb | 2 +- db/migrate/20161014220538_create_race.rb | 2 +- db/migrate/20161014223701_create_religions.rb | 2 +- db/migrate/20161016211328_create_magics.rb | 2 +- db/migrate/20161016213335_create_languages.rb | 2 +- db/migrate/20161016220220_create_scenes.rb | 2 +- db/migrate/20161016222100_create_groups.rb | 2 +- db/migrate/20161021103850_create_wildlifeship.rb | 2 +- db/migrate/20161021113013_add_notes_to_creatures.rb | 2 +- db/migrate/20161021114135_add_privacy_to_creatures.rb | 2 +- db/migrate/20161021202915_create_famous_figureship.rb | 2 +- .../20161021211814_remove_password_digest_from_users.rb | 2 +- db/migrate/20161021220223_create_raceships.rb | 2 +- db/migrate/20161021225347_create_religious_figureships.rb | 2 +- db/migrate/20161021225944_create_deityships.rb | 2 +- db/migrate/20161021230205_create_religious_locationships.rb | 2 +- db/migrate/20161021230419_create_artifactship.rb | 2 +- db/migrate/20161021230626_create_religious_raceship.rb | 2 +- db/migrate/20161024122250_create_group_leaderships.rb | 2 +- db/migrate/20161024123021_create_supergroupships.rb | 2 +- db/migrate/20161024123040_create_subgroupships.rb | 2 +- db/migrate/20161024123105_create_sistergroupships.rb | 2 +- db/migrate/20161024123140_create_group_allyships.rb | 2 +- db/migrate/20161024123157_create_group_enemyships.rb | 2 +- db/migrate/20161024123208_create_group_rivalships.rb | 2 +- db/migrate/20161024123232_create_group_clientships.rb | 2 +- db/migrate/20161024123248_create_group_suppierships.rb | 2 +- db/migrate/20161024123312_create_headquarterships.rb | 2 +- db/migrate/20161024123325_create_officeships.rb | 2 +- db/migrate/20161024123345_create_group_equipmentships.rb | 2 +- db/migrate/20161024123400_create_key_itemships.rb | 2 +- db/migrate/20161024195442_create_magic_deityship.rb | 2 +- db/migrate/20161024202657_create_lingualism.rb | 2 +- db/migrate/20161024204744_create_scene_characterships.rb | 2 +- db/migrate/20161024204806_create_scene_locationships.rb | 2 +- db/migrate/20161024204826_create_scene_itemships.rb | 2 +- db/migrate/20161029224240_add_privacy_to_races.rb | 2 +- db/migrate/20161029224408_add_privacy_to_religions.rb | 2 +- db/migrate/20161029224502_add_privacy_to_magics.rb | 2 +- db/migrate/20161029224540_add_privacy_to_languages.rb | 2 +- db/migrate/20161029224631_add_privacy_to_groups.rb | 2 +- db/migrate/20161029224722_add_privacy_to_scenes.rb | 2 +- db/migrate/20161102095042_add_plan_type_to_users.rb | 2 +- db/migrate/20161102182212_create_group_memberships.rb | 2 +- db/migrate/20161102182259_create_group_locationship.rb | 2 +- db/migrate/20170120213941_add_stripe_customer_id_to_user.rb | 2 +- db/migrate/20170120214443_create_billing_plans.rb | 2 +- db/migrate/20170120214721_create_subscriptions.rb | 2 +- db/migrate/20170127164644_add_email_updates_to_user.rb | 2 +- .../20170201151923_add_selected_billing_plan_id_to_user.rb | 2 +- db/migrate/20170216211714_create_image_uploads.rb | 2 +- db/migrate/20170216211914_add_src_to_image_uploads.rb | 2 +- db/migrate/20170218010814_add_bandwidth_to_user.rb | 2 +- .../20170218022943_add_bonus_bandwidth_to_billing_plan.rb | 2 +- db/migrate/20170228160245_create_creature_relationships.rb | 2 +- db/migrate/20170326164002_create_location_languageships.rb | 2 +- db/migrate/20170326170148_add_genre_to_universe.rb | 2 +- db/migrate/20170331001122_create_referral_codes.rb | 2 +- db/migrate/20170403180417_create_referrals.rb | 2 +- db/migrate/20170415183537_add_secure_code_to_users.rb | 2 +- db/migrate/20170415192410_create_votables.rb | 2 +- db/migrate/20170415192437_create_votes.rb | 2 +- db/migrate/20170417190318_create_raffle_entries.rb | 2 +- db/migrate/20170517152023_create_documents.rb | 2 +- db/migrate/20170517164648_add_fluid_preference_to_user.rb | 2 +- db/migrate/20170712190101_create_content_change_events.rb | 2 +- db/migrate/20170724114620_add_username_to_user.rb | 2 +- db/migrate/20170724114723_add_forum_admin_flag.rb | 2 +- db/migrate/20170731000013_create_floras.rb | 2 +- db/migrate/20170731000608_add_user_to_flora.rb | 2 +- db/migrate/20170731001131_add_universe_to_flora.rb | 2 +- db/migrate/20170731001803_add_notes_to_flora.rb | 2 +- db/migrate/20170731004406_create_flora_magical_effects.rb | 2 +- db/migrate/20170731004450_create_flora_locations.rb | 2 +- db/migrate/20170731004509_create_flora_eaten_bies.rb | 2 +- db/migrate/20170731004712_create_flora_relationships.rb | 2 +- db/migrate/20170731010449_add_privacy_to_flora.rb | 2 +- db/migrate/20170811145534_create_contributors.rb | 2 +- db/migrate/20171028220829_add_forum_admin_flag_again.rb | 2 +- db/migrate/20171028221518_remove_forum_admin_flag.rb | 2 +- db/migrate/20171028230258_create_delayed_jobs.rb | 2 +- db/migrate/20171226195348_add_deleted_at_to_items.rb | 2 +- db/migrate/20171226202223_add_deleted_at_to_users.rb | 2 +- db/migrate/20171226202321_add_deleted_at_to_characters.rb | 2 +- db/migrate/20171226202730_add_deleted_at_to_creatures.rb | 2 +- db/migrate/20171226202745_add_deleted_at_to_floras.rb | 2 +- db/migrate/20171226202810_add_deleted_at_to_groups.rb | 2 +- db/migrate/20171226203002_add_deleted_at_to_languages.rb | 2 +- db/migrate/20171226203016_add_deleted_at_to_locations.rb | 2 +- db/migrate/20171226203030_add_deleted_at_to_magics.rb | 2 +- db/migrate/20171226203042_add_deleted_at_to_races.rb | 2 +- db/migrate/20171226203059_add_deleted_at_to_religions.rb | 2 +- db/migrate/20171226203117_add_deleted_at_to_scenes.rb | 2 +- db/migrate/20171226203129_add_deleted_at_to_universes.rb | 2 +- db/migrate/20171226213749_create_character_love_interests.rb | 2 +- .../20171227180909_create_user_content_type_activators.rb | 2 +- db/migrate/20171231172750_create_countries.rb | 2 +- db/migrate/20171231174144_create_towns.rb | 2 +- db/migrate/20171231174241_create_landmarks.rb | 2 +- db/migrate/20171231175209_add_deleted_at_to_countries.rb | 2 +- db/migrate/20171231175633_add_fields_to_town.rb | 2 +- db/migrate/20171231175706_add_deleted_at_to_landmark.rb | 2 +- db/migrate/20171231191101_add_privacy_to_towns.rb | 2 +- db/migrate/20171231191117_add_privacy_to_countries.rb | 2 +- db/migrate/20171231191133_add_privacy_to_landmarks.rb | 2 +- db/migrate/20171231201746_add_user_to_towns.rb | 2 +- db/migrate/20171231201817_add_user_to_countries.rb | 2 +- db/migrate/20171231201900_add_user_to_landmarks.rb | 2 +- db/migrate/20171231230411_create_country_towns.rb | 2 +- db/migrate/20171231230524_create_country_locations.rb | 2 +- db/migrate/20171231230530_create_country_languages.rb | 2 +- db/migrate/20171231230535_create_country_religions.rb | 2 +- db/migrate/20171231230540_create_country_landmarks.rb | 2 +- db/migrate/20171231230546_create_country_creatures.rb | 2 +- db/migrate/20171231230551_create_country_floras.rb | 2 +- db/migrate/20171231230645_create_town_citizens.rb | 2 +- db/migrate/20171231230650_create_town_floras.rb | 2 +- db/migrate/20171231230656_create_town_creatures.rb | 2 +- db/migrate/20171231230701_create_town_groups.rb | 2 +- db/migrate/20171231230707_create_town_languages.rb | 2 +- db/migrate/20171231230712_create_town_countries.rb | 2 +- db/migrate/20171231230717_create_town_nearby_landmarks.rb | 2 +- db/migrate/20171231230751_create_landmark_nearby_towns.rb | 2 +- db/migrate/20171231230757_create_landmark_countries.rb | 2 +- db/migrate/20171231230802_create_landmark_floras.rb | 2 +- db/migrate/20171231235747_create_landmark_creatures.rb | 2 +- db/migrate/20180107183433_create_stripe_event_logs.rb | 2 +- .../20180112043008_add_site_administrator_flag_to_users.rb | 2 +- .../20180120010225_add_universe_id_index_to_characters.rb | 2 +- .../20180120031750_add_indexes_to_content_change_event.rb | 2 +- db/migrate/20180120032146_add_more_indices.rb | 2 +- db/migrate/20180120033402_add_universe_indices.rb | 2 +- db/migrate/20180127055730_create_planets.rb | 2 +- db/migrate/20180127200709_create_technologies.rb | 2 +- db/migrate/20180127200846_change_notes_column_on_planets.rb | 2 +- db/migrate/20180127202120_create_deities.rb | 2 +- db/migrate/20180127203130_create_governments.rb | 2 +- ...180129033131_rename_universe_technologies_to_technology.rb | 2 +- db/migrate/20180130231607_remove_landmarks_from_planets.rb | 2 +- db/migrate/20180130233224_create_planet_countries.rb | 2 +- db/migrate/20180130233229_create_planet_locations.rb | 2 +- db/migrate/20180130233235_create_planet_landmarks.rb | 2 +- db/migrate/20180130233240_create_planet_races.rb | 2 +- db/migrate/20180130233245_create_planet_floras.rb | 2 +- db/migrate/20180130233250_create_planet_creatures.rb | 2 +- db/migrate/20180130233256_create_planet_religions.rb | 2 +- db/migrate/20180130233301_create_planet_deities.rb | 2 +- db/migrate/20180130233306_create_planet_groups.rb | 2 +- db/migrate/20180130233311_create_planet_languages.rb | 2 +- db/migrate/20180130233316_create_planet_towns.rb | 2 +- db/migrate/20180130233539_create_planet_nearby_planets.rb | 2 +- db/migrate/20180130233841_create_technology_characters.rb | 2 +- db/migrate/20180130233846_create_technology_towns.rb | 2 +- db/migrate/20180130233851_create_technology_countries.rb | 2 +- db/migrate/20180130233857_create_technology_groups.rb | 2 +- db/migrate/20180130233902_create_technology_creatures.rb | 2 +- db/migrate/20180130233907_create_technology_planets.rb | 2 +- db/migrate/20180130233912_create_technology_magics.rb | 2 +- .../20180130233918_create_technology_parent_technologies.rb | 2 +- .../20180130233923_create_technology_child_technologies.rb | 2 +- .../20180130233928_create_technology_related_technologies.rb | 2 +- db/migrate/20180130234318_create_deity_character_parents.rb | 2 +- db/migrate/20180130234323_create_deity_character_partners.rb | 2 +- db/migrate/20180130234329_create_deity_character_children.rb | 2 +- db/migrate/20180130234334_create_deity_deity_parents.rb | 2 +- db/migrate/20180130234339_create_deity_deity_partners.rb | 2 +- db/migrate/20180130234344_create_deity_deity_children.rb | 2 +- db/migrate/20180130234349_create_deity_creatures.rb | 2 +- db/migrate/20180130234355_create_deity_floras.rb | 2 +- db/migrate/20180130234400_create_deity_religions.rb | 2 +- db/migrate/20180130234405_create_deity_relics.rb | 2 +- db/migrate/20180130234410_create_deity_abilities.rb | 2 +- db/migrate/20180130234415_create_deity_related_towns.rb | 2 +- db/migrate/20180130234420_create_deity_related_landmarks.rb | 2 +- db/migrate/20180130234505_create_government_leaders.rb | 2 +- db/migrate/20180130234511_create_government_groups.rb | 2 +- .../20180130234516_create_government_political_figures.rb | 2 +- db/migrate/20180130234521_create_government_items.rb | 2 +- db/migrate/20180130234526_create_government_technologies.rb | 2 +- db/migrate/20180130234531_create_government_creatures.rb | 2 +- db/migrate/20180131055724_create_character_items.rb | 2 +- db/migrate/20180131055729_create_character_technologies.rb | 2 +- db/migrate/20180131055734_create_character_floras.rb | 2 +- db/migrate/20180131055739_create_character_friends.rb | 2 +- db/migrate/20180131055744_create_character_companions.rb | 2 +- db/migrate/20180131060014_create_character_birthtowns.rb | 2 +- db/migrate/20180131061140_create_location_capital_towns.rb | 2 +- db/migrate/20180131061146_create_location_largest_towns.rb | 2 +- db/migrate/20180131061151_create_location_notable_towns.rb | 2 +- db/migrate/20180131061726_create_location_landmarks.rb | 2 +- db/migrate/20180131061902_create_item_magics.rb | 2 +- db/migrate/20180131062407_create_country_governments.rb | 2 +- db/migrate/20180131062923_create_group_creatures.rb | 2 +- db/migrate/20180131063312_create_character_magics.rb | 2 +- db/migrate/20180131063532_create_character_enemies.rb | 2 +- .../20180131064051_add_classification_fields_to_creatures.rb | 2 +- db/migrate/20180131064902_add_material_uses_to_flora.rb | 2 +- db/migrate/20180202055802_create_deity_character_siblings.rb | 2 +- db/migrate/20180202055822_create_deity_deity_siblings.rb | 2 +- db/migrate/20180202064238_create_deity_races.rb | 2 +- .../20180620012919_add_forum_moderator_flag_to_users.rb | 2 +- 396 files changed, 416 insertions(+), 416 deletions(-) create mode 100644 app/models/application_record.rb diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 00000000..10a4cba8 --- /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/attribute.rb b/app/models/attribute.rb index c3272935..87f03e55 100644 --- a/app/models/attribute.rb +++ b/app/models/attribute.rb @@ -1,4 +1,4 @@ -class Attribute < ActiveRecord::Base +class Attribute < ActiveRecord belongs_to :user belongs_to :attribute_field belongs_to :entity, polymorphic: true diff --git a/app/models/attribute_category.rb b/app/models/attribute_category.rb index fa5e66f2..020643b8 100644 --- a/app/models/attribute_category.rb +++ b/app/models/attribute_category.rb @@ -1,4 +1,4 @@ -class AttributeCategory < ActiveRecord::Base +class AttributeCategory < ActiveRecord validates :name, presence: true belongs_to :user diff --git a/app/models/attribute_field.rb b/app/models/attribute_field.rb index 880b91bf..1980cd00 100644 --- a/app/models/attribute_field.rb +++ b/app/models/attribute_field.rb @@ -1,4 +1,4 @@ -class AttributeField < ActiveRecord::Base +class AttributeField < ActiveRecord validates :name, presence: true belongs_to :user diff --git a/app/models/billing_plan.rb b/app/models/billing_plan.rb index 84d59b53..abeaa8f3 100644 --- a/app/models/billing_plan.rb +++ b/app/models/billing_plan.rb @@ -1,3 +1,3 @@ -class BillingPlan < ActiveRecord::Base +class BillingPlan < ActiveRecord PREMIUM_IDS = [2, 3, 4, 5, 6] end diff --git a/app/models/content_change_event.rb b/app/models/content_change_event.rb index e98388ab..254d994a 100644 --- a/app/models/content_change_event.rb +++ b/app/models/content_change_event.rb @@ -1,4 +1,4 @@ -class ContentChangeEvent < ActiveRecord::Base +class ContentChangeEvent < ActiveRecord belongs_to :user serialize :changed_fields, Hash diff --git a/app/models/content_groupers/archenemyship.rb b/app/models/content_groupers/archenemyship.rb index 4ffdde3c..a8cab8af 100644 --- a/app/models/content_groupers/archenemyship.rb +++ b/app/models/content_groupers/archenemyship.rb @@ -1,4 +1,4 @@ -class Archenemyship < ActiveRecord::Base +class Archenemyship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/artifactship.rb b/app/models/content_groupers/artifactship.rb index c471c7ef..450bfb8e 100644 --- a/app/models/content_groupers/artifactship.rb +++ b/app/models/content_groupers/artifactship.rb @@ -1,8 +1,8 @@ -class Artifactship < ActiveRecord::Base +class Artifactship < ActiveRecord include HasContentLinking belongs_to :user belongs_to :religion belongs_to :artifact, class_name: 'Item' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/best_friendship.rb b/app/models/content_groupers/best_friendship.rb index 48bea44b..ac9c8a0a 100644 --- a/app/models/content_groupers/best_friendship.rb +++ b/app/models/content_groupers/best_friendship.rb @@ -1,4 +1,4 @@ -class BestFriendship < ActiveRecord::Base +class BestFriendship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/birthing.rb b/app/models/content_groupers/birthing.rb index 3c5e41c0..1762c4c2 100644 --- a/app/models/content_groupers/birthing.rb +++ b/app/models/content_groupers/birthing.rb @@ -1,4 +1,4 @@ -class Birthing < ActiveRecord::Base +class Birthing < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/capital_cities_relationship.rb b/app/models/content_groupers/capital_cities_relationship.rb index ebba284b..0b491ba8 100644 --- a/app/models/content_groupers/capital_cities_relationship.rb +++ b/app/models/content_groupers/capital_cities_relationship.rb @@ -1,6 +1,6 @@ # Defines a relation between a location and any capital cities within it, # and a reverse relation for all locations in which they are the capital of. -class CapitalCitiesRelationship < ActiveRecord::Base +class CapitalCitiesRelationship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/character_birthtown.rb b/app/models/content_groupers/character_birthtown.rb index 2359f56b..10447618 100644 --- a/app/models/content_groupers/character_birthtown.rb +++ b/app/models/content_groupers/character_birthtown.rb @@ -1,4 +1,4 @@ -class CharacterBirthtown < ActiveRecord::Base +class CharacterBirthtown < ActiveRecord belongs_to :user belongs_to :character belongs_to :birthtown, class_name: Town.name diff --git a/app/models/content_groupers/character_companion.rb b/app/models/content_groupers/character_companion.rb index 829dca6e..19b9f1ab 100644 --- a/app/models/content_groupers/character_companion.rb +++ b/app/models/content_groupers/character_companion.rb @@ -1,4 +1,4 @@ -class CharacterCompanion < ActiveRecord::Base +class CharacterCompanion < ActiveRecord belongs_to :user belongs_to :character belongs_to :companion, class_name: Creature.name diff --git a/app/models/content_groupers/character_enemy.rb b/app/models/content_groupers/character_enemy.rb index 6327e7f2..9d984a0b 100644 --- a/app/models/content_groupers/character_enemy.rb +++ b/app/models/content_groupers/character_enemy.rb @@ -1,4 +1,4 @@ -class CharacterEnemy < ActiveRecord::Base +class CharacterEnemy < ActiveRecord belongs_to :character belongs_to :user belongs_to :enemy, class_name: Character.name diff --git a/app/models/content_groupers/character_flora.rb b/app/models/content_groupers/character_flora.rb index c951f513..7b15c23d 100644 --- a/app/models/content_groupers/character_flora.rb +++ b/app/models/content_groupers/character_flora.rb @@ -1,4 +1,4 @@ -class CharacterFlora < ActiveRecord::Base +class CharacterFlora < ActiveRecord belongs_to :user belongs_to :character belongs_to :flora diff --git a/app/models/content_groupers/character_friend.rb b/app/models/content_groupers/character_friend.rb index 4e886fde..f36f10f7 100644 --- a/app/models/content_groupers/character_friend.rb +++ b/app/models/content_groupers/character_friend.rb @@ -1,4 +1,4 @@ -class CharacterFriend < ActiveRecord::Base +class CharacterFriend < ActiveRecord belongs_to :user belongs_to :character belongs_to :friend, class_name: Character.name diff --git a/app/models/content_groupers/character_item.rb b/app/models/content_groupers/character_item.rb index 14e682bd..a602643a 100644 --- a/app/models/content_groupers/character_item.rb +++ b/app/models/content_groupers/character_item.rb @@ -1,4 +1,4 @@ -class CharacterItem < ActiveRecord::Base +class CharacterItem < ActiveRecord belongs_to :user belongs_to :character belongs_to :item diff --git a/app/models/content_groupers/character_love_interest.rb b/app/models/content_groupers/character_love_interest.rb index 78de4a6c..8b2c4175 100644 --- a/app/models/content_groupers/character_love_interest.rb +++ b/app/models/content_groupers/character_love_interest.rb @@ -1,4 +1,4 @@ -class CharacterLoveInterest < ActiveRecord::Base +class CharacterLoveInterest < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/character_magic.rb b/app/models/content_groupers/character_magic.rb index c0c22c27..1d19e00d 100644 --- a/app/models/content_groupers/character_magic.rb +++ b/app/models/content_groupers/character_magic.rb @@ -1,4 +1,4 @@ -class CharacterMagic < ActiveRecord::Base +class CharacterMagic < ActiveRecord belongs_to :character belongs_to :magic belongs_to :user diff --git a/app/models/content_groupers/character_technology.rb b/app/models/content_groupers/character_technology.rb index 19d6f56d..48eb34ef 100644 --- a/app/models/content_groupers/character_technology.rb +++ b/app/models/content_groupers/character_technology.rb @@ -1,4 +1,4 @@ -class CharacterTechnology < ActiveRecord::Base +class CharacterTechnology < ActiveRecord belongs_to :user belongs_to :character belongs_to :technology diff --git a/app/models/content_groupers/childrenship.rb b/app/models/content_groupers/childrenship.rb index 48bf7cd9..5bbf8741 100644 --- a/app/models/content_groupers/childrenship.rb +++ b/app/models/content_groupers/childrenship.rb @@ -1,4 +1,4 @@ -class Childrenship < ActiveRecord::Base +class Childrenship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/country_creature.rb b/app/models/content_groupers/country_creature.rb index deaaae46..b96d6c93 100644 --- a/app/models/content_groupers/country_creature.rb +++ b/app/models/content_groupers/country_creature.rb @@ -1,4 +1,4 @@ -class CountryCreature < ActiveRecord::Base +class CountryCreature < ActiveRecord belongs_to :user belongs_to :country belongs_to :creature diff --git a/app/models/content_groupers/country_flora.rb b/app/models/content_groupers/country_flora.rb index 06d1cf6c..d1f42f8a 100644 --- a/app/models/content_groupers/country_flora.rb +++ b/app/models/content_groupers/country_flora.rb @@ -1,4 +1,4 @@ -class CountryFlora < ActiveRecord::Base +class CountryFlora < ActiveRecord belongs_to :user belongs_to :country belongs_to :flora diff --git a/app/models/content_groupers/country_government.rb b/app/models/content_groupers/country_government.rb index 292080d9..d86bb805 100644 --- a/app/models/content_groupers/country_government.rb +++ b/app/models/content_groupers/country_government.rb @@ -1,4 +1,4 @@ -class CountryGovernment < ActiveRecord::Base +class CountryGovernment < ActiveRecord belongs_to :country belongs_to :government belongs_to :user diff --git a/app/models/content_groupers/country_landmark.rb b/app/models/content_groupers/country_landmark.rb index d3090955..ec1886dd 100644 --- a/app/models/content_groupers/country_landmark.rb +++ b/app/models/content_groupers/country_landmark.rb @@ -1,4 +1,4 @@ -class CountryLandmark < ActiveRecord::Base +class CountryLandmark < ActiveRecord belongs_to :user belongs_to :country belongs_to :landmark diff --git a/app/models/content_groupers/country_language.rb b/app/models/content_groupers/country_language.rb index 851eb606..6669dd53 100644 --- a/app/models/content_groupers/country_language.rb +++ b/app/models/content_groupers/country_language.rb @@ -1,4 +1,4 @@ -class CountryLanguage < ActiveRecord::Base +class CountryLanguage < ActiveRecord belongs_to :user belongs_to :country belongs_to :language diff --git a/app/models/content_groupers/country_location.rb b/app/models/content_groupers/country_location.rb index f5da1e00..1440bca7 100644 --- a/app/models/content_groupers/country_location.rb +++ b/app/models/content_groupers/country_location.rb @@ -1,4 +1,4 @@ -class CountryLocation < ActiveRecord::Base +class CountryLocation < ActiveRecord belongs_to :user belongs_to :country belongs_to :location diff --git a/app/models/content_groupers/country_religion.rb b/app/models/content_groupers/country_religion.rb index d772fabd..d26a95c6 100644 --- a/app/models/content_groupers/country_religion.rb +++ b/app/models/content_groupers/country_religion.rb @@ -1,4 +1,4 @@ -class CountryReligion < ActiveRecord::Base +class CountryReligion < ActiveRecord belongs_to :user belongs_to :country belongs_to :religion diff --git a/app/models/content_groupers/country_town.rb b/app/models/content_groupers/country_town.rb index a5ebd032..4f5a18d6 100644 --- a/app/models/content_groupers/country_town.rb +++ b/app/models/content_groupers/country_town.rb @@ -1,4 +1,4 @@ -class CountryTown < ActiveRecord::Base +class CountryTown < ActiveRecord belongs_to :user belongs_to :country belongs_to :town diff --git a/app/models/content_groupers/creature_relationship.rb b/app/models/content_groupers/creature_relationship.rb index f84188de..fa738089 100644 --- a/app/models/content_groupers/creature_relationship.rb +++ b/app/models/content_groupers/creature_relationship.rb @@ -1,4 +1,4 @@ -class CreatureRelationship < ActiveRecord::Base +class CreatureRelationship < ActiveRecord include HasContentLinking LINK_TYPE = :two_way diff --git a/app/models/content_groupers/current_ownership.rb b/app/models/content_groupers/current_ownership.rb index be1949c2..b02061fd 100644 --- a/app/models/content_groupers/current_ownership.rb +++ b/app/models/content_groupers/current_ownership.rb @@ -1,6 +1,6 @@ # Defines a relation from an Item to the Character that currently owns it # and an inverse relationship from a Character to all items it currently owns -class CurrentOwnership < ActiveRecord::Base +class CurrentOwnership < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/deity_ability.rb b/app/models/content_groupers/deity_ability.rb index d5724fce..ede39767 100644 --- a/app/models/content_groupers/deity_ability.rb +++ b/app/models/content_groupers/deity_ability.rb @@ -1,4 +1,4 @@ -class DeityAbility < ActiveRecord::Base +class DeityAbility < ActiveRecord belongs_to :user belongs_to :deity belongs_to :ability, class_name: Magic.name diff --git a/app/models/content_groupers/deity_character_child.rb b/app/models/content_groupers/deity_character_child.rb index 8df10efc..4ea793db 100644 --- a/app/models/content_groupers/deity_character_child.rb +++ b/app/models/content_groupers/deity_character_child.rb @@ -1,4 +1,4 @@ -class DeityCharacterChild < ActiveRecord::Base +class DeityCharacterChild < ActiveRecord belongs_to :user belongs_to :deity belongs_to :character_child, class_name: Character.name diff --git a/app/models/content_groupers/deity_character_parent.rb b/app/models/content_groupers/deity_character_parent.rb index ae662898..96cd99a5 100644 --- a/app/models/content_groupers/deity_character_parent.rb +++ b/app/models/content_groupers/deity_character_parent.rb @@ -1,4 +1,4 @@ -class DeityCharacterParent < ActiveRecord::Base +class DeityCharacterParent < ActiveRecord belongs_to :user belongs_to :deity belongs_to :character_parent, class_name: Character.name diff --git a/app/models/content_groupers/deity_character_partner.rb b/app/models/content_groupers/deity_character_partner.rb index 47d47730..6f37f897 100644 --- a/app/models/content_groupers/deity_character_partner.rb +++ b/app/models/content_groupers/deity_character_partner.rb @@ -1,4 +1,4 @@ -class DeityCharacterPartner < ActiveRecord::Base +class DeityCharacterPartner < ActiveRecord belongs_to :user belongs_to :deity belongs_to :character_partner, class_name: Character.name diff --git a/app/models/content_groupers/deity_character_sibling.rb b/app/models/content_groupers/deity_character_sibling.rb index ad4589df..5c2b159c 100644 --- a/app/models/content_groupers/deity_character_sibling.rb +++ b/app/models/content_groupers/deity_character_sibling.rb @@ -1,4 +1,4 @@ -class DeityCharacterSibling < ActiveRecord::Base +class DeityCharacterSibling < ActiveRecord include HasContentLinking belongs_to :deity diff --git a/app/models/content_groupers/deity_creature.rb b/app/models/content_groupers/deity_creature.rb index 172c48d0..72891e30 100644 --- a/app/models/content_groupers/deity_creature.rb +++ b/app/models/content_groupers/deity_creature.rb @@ -1,4 +1,4 @@ -class DeityCreature < ActiveRecord::Base +class DeityCreature < ActiveRecord belongs_to :user belongs_to :deity belongs_to :creature diff --git a/app/models/content_groupers/deity_deity_child.rb b/app/models/content_groupers/deity_deity_child.rb index 019ed836..e1f4b6db 100644 --- a/app/models/content_groupers/deity_deity_child.rb +++ b/app/models/content_groupers/deity_deity_child.rb @@ -1,4 +1,4 @@ -class DeityDeityChild < ActiveRecord::Base +class DeityDeityChild < ActiveRecord belongs_to :user belongs_to :deity belongs_to :deity_child, class_name: Deity.name diff --git a/app/models/content_groupers/deity_deity_parent.rb b/app/models/content_groupers/deity_deity_parent.rb index 22ea357f..ab91120f 100644 --- a/app/models/content_groupers/deity_deity_parent.rb +++ b/app/models/content_groupers/deity_deity_parent.rb @@ -1,4 +1,4 @@ -class DeityDeityParent < ActiveRecord::Base +class DeityDeityParent < ActiveRecord belongs_to :user belongs_to :deity belongs_to :deity_parent, class_name: Deity.name diff --git a/app/models/content_groupers/deity_deity_partner.rb b/app/models/content_groupers/deity_deity_partner.rb index 7094886b..e400ff5e 100644 --- a/app/models/content_groupers/deity_deity_partner.rb +++ b/app/models/content_groupers/deity_deity_partner.rb @@ -1,4 +1,4 @@ -class DeityDeityPartner < ActiveRecord::Base +class DeityDeityPartner < ActiveRecord belongs_to :user belongs_to :deity belongs_to :deity_partner, class_name: Deity.name diff --git a/app/models/content_groupers/deity_deity_sibling.rb b/app/models/content_groupers/deity_deity_sibling.rb index 3c32c85b..7914eb1c 100644 --- a/app/models/content_groupers/deity_deity_sibling.rb +++ b/app/models/content_groupers/deity_deity_sibling.rb @@ -1,4 +1,4 @@ -class DeityDeitySibling < ActiveRecord::Base +class DeityDeitySibling < ActiveRecord include HasContentLinking belongs_to :deity diff --git a/app/models/content_groupers/deity_flora.rb b/app/models/content_groupers/deity_flora.rb index 73b8cc78..8be1750b 100644 --- a/app/models/content_groupers/deity_flora.rb +++ b/app/models/content_groupers/deity_flora.rb @@ -1,4 +1,4 @@ -class DeityFlora < ActiveRecord::Base +class DeityFlora < ActiveRecord belongs_to :user belongs_to :deity belongs_to :flora diff --git a/app/models/content_groupers/deity_race.rb b/app/models/content_groupers/deity_race.rb index 3b937756..43a7921b 100644 --- a/app/models/content_groupers/deity_race.rb +++ b/app/models/content_groupers/deity_race.rb @@ -1,4 +1,4 @@ -class DeityRace < ActiveRecord::Base +class DeityRace < ActiveRecord belongs_to :deity belongs_to :race belongs_to :user diff --git a/app/models/content_groupers/deity_related_landmark.rb b/app/models/content_groupers/deity_related_landmark.rb index b7eef19a..4b17646d 100644 --- a/app/models/content_groupers/deity_related_landmark.rb +++ b/app/models/content_groupers/deity_related_landmark.rb @@ -1,4 +1,4 @@ -class DeityRelatedLandmark < ActiveRecord::Base +class DeityRelatedLandmark < ActiveRecord belongs_to :user belongs_to :deity belongs_to :related_landmark, class_name: Landmark.name diff --git a/app/models/content_groupers/deity_related_town.rb b/app/models/content_groupers/deity_related_town.rb index a4486996..56412377 100644 --- a/app/models/content_groupers/deity_related_town.rb +++ b/app/models/content_groupers/deity_related_town.rb @@ -1,4 +1,4 @@ -class DeityRelatedTown < ActiveRecord::Base +class DeityRelatedTown < ActiveRecord belongs_to :user belongs_to :deity belongs_to :related_town, class_name: Town.name diff --git a/app/models/content_groupers/deity_relic.rb b/app/models/content_groupers/deity_relic.rb index ff7ded48..83273b38 100644 --- a/app/models/content_groupers/deity_relic.rb +++ b/app/models/content_groupers/deity_relic.rb @@ -1,4 +1,4 @@ -class DeityRelic < ActiveRecord::Base +class DeityRelic < ActiveRecord belongs_to :user belongs_to :deity belongs_to :relic, class_name: Item.name diff --git a/app/models/content_groupers/deity_religion.rb b/app/models/content_groupers/deity_religion.rb index 55ea56bb..0bfc0d5e 100644 --- a/app/models/content_groupers/deity_religion.rb +++ b/app/models/content_groupers/deity_religion.rb @@ -1,4 +1,4 @@ -class DeityReligion < ActiveRecord::Base +class DeityReligion < ActiveRecord belongs_to :user belongs_to :deity belongs_to :religion diff --git a/app/models/content_groupers/deityship.rb b/app/models/content_groupers/deityship.rb index b7a5c7cb..1f34d868 100644 --- a/app/models/content_groupers/deityship.rb +++ b/app/models/content_groupers/deityship.rb @@ -1,4 +1,4 @@ -class Deityship < ActiveRecord::Base +class Deityship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/famous_figureship.rb b/app/models/content_groupers/famous_figureship.rb index fc692a5c..6c863156 100644 --- a/app/models/content_groupers/famous_figureship.rb +++ b/app/models/content_groupers/famous_figureship.rb @@ -1,4 +1,4 @@ -class FamousFigureship < ActiveRecord::Base +class FamousFigureship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/fathership.rb b/app/models/content_groupers/fathership.rb index bc132987..2fc3684e 100644 --- a/app/models/content_groupers/fathership.rb +++ b/app/models/content_groupers/fathership.rb @@ -1,4 +1,4 @@ -class Fathership < ActiveRecord::Base +class Fathership < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/flora_eaten_by.rb b/app/models/content_groupers/flora_eaten_by.rb index 793b4ed8..cce2882f 100644 --- a/app/models/content_groupers/flora_eaten_by.rb +++ b/app/models/content_groupers/flora_eaten_by.rb @@ -1,4 +1,4 @@ -class FloraEatenBy < ActiveRecord::Base +class FloraEatenBy < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/flora_location.rb b/app/models/content_groupers/flora_location.rb index 38e581fb..923f59b2 100644 --- a/app/models/content_groupers/flora_location.rb +++ b/app/models/content_groupers/flora_location.rb @@ -1,4 +1,4 @@ -class FloraLocation < ActiveRecord::Base +class FloraLocation < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/flora_magical_effect.rb b/app/models/content_groupers/flora_magical_effect.rb index e9e8dbf1..090dc1b8 100644 --- a/app/models/content_groupers/flora_magical_effect.rb +++ b/app/models/content_groupers/flora_magical_effect.rb @@ -1,4 +1,4 @@ -class FloraMagicalEffect < ActiveRecord::Base +class FloraMagicalEffect < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/flora_relationship.rb b/app/models/content_groupers/flora_relationship.rb index e1ef33f7..86bde11b 100644 --- a/app/models/content_groupers/flora_relationship.rb +++ b/app/models/content_groupers/flora_relationship.rb @@ -1,4 +1,4 @@ -class FloraRelationship < ActiveRecord::Base +class FloraRelationship < ActiveRecord include HasContentLinking LINK_TYPE = :two_way diff --git a/app/models/content_groupers/government_creature.rb b/app/models/content_groupers/government_creature.rb index ecf5a000..d95ab80f 100644 --- a/app/models/content_groupers/government_creature.rb +++ b/app/models/content_groupers/government_creature.rb @@ -1,4 +1,4 @@ -class GovernmentCreature < ActiveRecord::Base +class GovernmentCreature < ActiveRecord belongs_to :user belongs_to :government belongs_to :creature diff --git a/app/models/content_groupers/government_group.rb b/app/models/content_groupers/government_group.rb index 5d7644e4..9a2e2682 100644 --- a/app/models/content_groupers/government_group.rb +++ b/app/models/content_groupers/government_group.rb @@ -1,4 +1,4 @@ -class GovernmentGroup < ActiveRecord::Base +class GovernmentGroup < ActiveRecord belongs_to :user belongs_to :government belongs_to :group diff --git a/app/models/content_groupers/government_item.rb b/app/models/content_groupers/government_item.rb index 4b679556..eacf1d60 100644 --- a/app/models/content_groupers/government_item.rb +++ b/app/models/content_groupers/government_item.rb @@ -1,4 +1,4 @@ -class GovernmentItem < ActiveRecord::Base +class GovernmentItem < ActiveRecord belongs_to :user belongs_to :government belongs_to :item diff --git a/app/models/content_groupers/government_leader.rb b/app/models/content_groupers/government_leader.rb index 1bffb351..715d1a93 100644 --- a/app/models/content_groupers/government_leader.rb +++ b/app/models/content_groupers/government_leader.rb @@ -1,4 +1,4 @@ -class GovernmentLeader < ActiveRecord::Base +class GovernmentLeader < ActiveRecord belongs_to :user belongs_to :government belongs_to :leader, class_name: Character.name diff --git a/app/models/content_groupers/government_political_figure.rb b/app/models/content_groupers/government_political_figure.rb index 2c58d0ef..f4e63c98 100644 --- a/app/models/content_groupers/government_political_figure.rb +++ b/app/models/content_groupers/government_political_figure.rb @@ -1,4 +1,4 @@ -class GovernmentPoliticalFigure < ActiveRecord::Base +class GovernmentPoliticalFigure < ActiveRecord belongs_to :user belongs_to :government belongs_to :political_figure, class_name: Character.name diff --git a/app/models/content_groupers/government_technology.rb b/app/models/content_groupers/government_technology.rb index 86e72782..23247d9f 100644 --- a/app/models/content_groupers/government_technology.rb +++ b/app/models/content_groupers/government_technology.rb @@ -1,4 +1,4 @@ -class GovernmentTechnology < ActiveRecord::Base +class GovernmentTechnology < ActiveRecord belongs_to :user belongs_to :government belongs_to :technology diff --git a/app/models/content_groupers/group_allyship.rb b/app/models/content_groupers/group_allyship.rb index 9f516ad5..3132cac2 100644 --- a/app/models/content_groupers/group_allyship.rb +++ b/app/models/content_groupers/group_allyship.rb @@ -1,4 +1,4 @@ -class GroupAllyship < ActiveRecord::Base +class GroupAllyship < ActiveRecord include HasContentLinking belongs_to :user @@ -17,4 +17,4 @@ class GroupAllyship < ActiveRecord::Base other_object.allies.delete this_object end -end \ No newline at end of file +end diff --git a/app/models/content_groupers/group_clientship.rb b/app/models/content_groupers/group_clientship.rb index 10e54909..c83975c0 100644 --- a/app/models/content_groupers/group_clientship.rb +++ b/app/models/content_groupers/group_clientship.rb @@ -1,8 +1,8 @@ -class GroupClientship < ActiveRecord::Base +class GroupClientship < ActiveRecord include HasContentLinking belongs_to :user belongs_to :group belongs_to :client, class_name: 'Group' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/group_creature.rb b/app/models/content_groupers/group_creature.rb index 2e5d306b..888f557d 100644 --- a/app/models/content_groupers/group_creature.rb +++ b/app/models/content_groupers/group_creature.rb @@ -1,4 +1,4 @@ -class GroupCreature < ActiveRecord::Base +class GroupCreature < ActiveRecord belongs_to :group belongs_to :creature belongs_to :user diff --git a/app/models/content_groupers/group_enemyship.rb b/app/models/content_groupers/group_enemyship.rb index c9fb720a..9ae86cf7 100644 --- a/app/models/content_groupers/group_enemyship.rb +++ b/app/models/content_groupers/group_enemyship.rb @@ -1,4 +1,4 @@ -class GroupEnemyship < ActiveRecord::Base +class GroupEnemyship < ActiveRecord include HasContentLinking belongs_to :user @@ -17,4 +17,4 @@ class GroupEnemyship < ActiveRecord::Base other_object.enemies.delete this_object end -end \ No newline at end of file +end diff --git a/app/models/content_groupers/group_equipmentship.rb b/app/models/content_groupers/group_equipmentship.rb index d3a12eff..bdbfbd16 100644 --- a/app/models/content_groupers/group_equipmentship.rb +++ b/app/models/content_groupers/group_equipmentship.rb @@ -1,8 +1,8 @@ -class GroupEquipmentship < ActiveRecord::Base +class GroupEquipmentship < ActiveRecord include HasContentLinking belongs_to :user belongs_to :group belongs_to :equipment, class_name: 'Item' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/group_leadership.rb b/app/models/content_groupers/group_leadership.rb index 44614f1e..1030dabb 100644 --- a/app/models/content_groupers/group_leadership.rb +++ b/app/models/content_groupers/group_leadership.rb @@ -1,8 +1,8 @@ -class GroupLeadership < ActiveRecord::Base +class GroupLeadership < ActiveRecord include HasContentLinking belongs_to :user belongs_to :group belongs_to :leader, class_name: 'Character' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/group_locationship.rb b/app/models/content_groupers/group_locationship.rb index 83dc1d29..2feb3de0 100644 --- a/app/models/content_groupers/group_locationship.rb +++ b/app/models/content_groupers/group_locationship.rb @@ -1,8 +1,8 @@ -class GroupLocationship < ActiveRecord::Base +class GroupLocationship < ActiveRecord include HasContentLinking belongs_to :user belongs_to :group belongs_to :location -end \ No newline at end of file +end diff --git a/app/models/content_groupers/group_membership.rb b/app/models/content_groupers/group_membership.rb index d23d4484..82652834 100644 --- a/app/models/content_groupers/group_membership.rb +++ b/app/models/content_groupers/group_membership.rb @@ -1,8 +1,8 @@ -class GroupMembership < ActiveRecord::Base +class GroupMembership < ActiveRecord include HasContentLinking belongs_to :user belongs_to :group belongs_to :member, class_name: 'Character' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/group_rivalship.rb b/app/models/content_groupers/group_rivalship.rb index 2bea93ba..4983deec 100644 --- a/app/models/content_groupers/group_rivalship.rb +++ b/app/models/content_groupers/group_rivalship.rb @@ -1,4 +1,4 @@ -class GroupRivalship < ActiveRecord::Base +class GroupRivalship < ActiveRecord include HasContentLinking belongs_to :user @@ -17,4 +17,4 @@ class GroupRivalship < ActiveRecord::Base other_object.rivals.delete this_object end -end \ No newline at end of file +end diff --git a/app/models/content_groupers/group_suppliership.rb b/app/models/content_groupers/group_suppliership.rb index 3ddcbd94..7d004f02 100644 --- a/app/models/content_groupers/group_suppliership.rb +++ b/app/models/content_groupers/group_suppliership.rb @@ -1,8 +1,8 @@ -class GroupSuppliership < ActiveRecord::Base +class GroupSuppliership < ActiveRecord include HasContentLinking belongs_to :user belongs_to :group belongs_to :supplier, class_name: 'Group' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/headquartership.rb b/app/models/content_groupers/headquartership.rb index 0912ed01..2d0b668a 100644 --- a/app/models/content_groupers/headquartership.rb +++ b/app/models/content_groupers/headquartership.rb @@ -1,8 +1,8 @@ -class Headquartership < ActiveRecord::Base +class Headquartership < ActiveRecord include HasContentLinking belongs_to :user belongs_to :group belongs_to :headquarter, class_name: 'Location' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/item_magic.rb b/app/models/content_groupers/item_magic.rb index aee842d1..a56953d1 100644 --- a/app/models/content_groupers/item_magic.rb +++ b/app/models/content_groupers/item_magic.rb @@ -1,4 +1,4 @@ -class ItemMagic < ActiveRecord::Base +class ItemMagic < ActiveRecord belongs_to :item belongs_to :magic belongs_to :user diff --git a/app/models/content_groupers/key_itemship.rb b/app/models/content_groupers/key_itemship.rb index 05d68817..80465797 100644 --- a/app/models/content_groupers/key_itemship.rb +++ b/app/models/content_groupers/key_itemship.rb @@ -1,8 +1,8 @@ -class KeyItemship < ActiveRecord::Base +class KeyItemship < ActiveRecord include HasContentLinking belongs_to :user belongs_to :group belongs_to :key_item, class_name: 'Item' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/landmark_country.rb b/app/models/content_groupers/landmark_country.rb index 0752495f..0580fc79 100644 --- a/app/models/content_groupers/landmark_country.rb +++ b/app/models/content_groupers/landmark_country.rb @@ -1,4 +1,4 @@ -class LandmarkCountry < ActiveRecord::Base +class LandmarkCountry < ActiveRecord belongs_to :user belongs_to :landmark belongs_to :country diff --git a/app/models/content_groupers/landmark_creature.rb b/app/models/content_groupers/landmark_creature.rb index 075d0065..c02976ab 100644 --- a/app/models/content_groupers/landmark_creature.rb +++ b/app/models/content_groupers/landmark_creature.rb @@ -1,4 +1,4 @@ -class LandmarkCreature < ActiveRecord::Base +class LandmarkCreature < ActiveRecord belongs_to :user belongs_to :landmark belongs_to :creature diff --git a/app/models/content_groupers/landmark_flora.rb b/app/models/content_groupers/landmark_flora.rb index 23f44e01..51d5d81c 100644 --- a/app/models/content_groupers/landmark_flora.rb +++ b/app/models/content_groupers/landmark_flora.rb @@ -1,4 +1,4 @@ -class LandmarkFlora < ActiveRecord::Base +class LandmarkFlora < ActiveRecord belongs_to :user belongs_to :landmark belongs_to :flora diff --git a/app/models/content_groupers/landmark_nearby_town.rb b/app/models/content_groupers/landmark_nearby_town.rb index e40e3610..68d639f4 100644 --- a/app/models/content_groupers/landmark_nearby_town.rb +++ b/app/models/content_groupers/landmark_nearby_town.rb @@ -1,4 +1,4 @@ -class LandmarkNearbyTown < ActiveRecord::Base +class LandmarkNearbyTown < ActiveRecord belongs_to :user belongs_to :landmark diff --git a/app/models/content_groupers/largest_cities_relationship.rb b/app/models/content_groupers/largest_cities_relationship.rb index a8c1ca22..f6032d95 100644 --- a/app/models/content_groupers/largest_cities_relationship.rb +++ b/app/models/content_groupers/largest_cities_relationship.rb @@ -1,4 +1,4 @@ -class LargestCitiesRelationship < ActiveRecord::Base +class LargestCitiesRelationship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/lingualism.rb b/app/models/content_groupers/lingualism.rb index 82fb5fd5..2bf6d322 100644 --- a/app/models/content_groupers/lingualism.rb +++ b/app/models/content_groupers/lingualism.rb @@ -1,8 +1,8 @@ -class Lingualism < ActiveRecord::Base +class Lingualism < ActiveRecord include HasContentLinking belongs_to :user belongs_to :character belongs_to :spoken_language, class_name: 'Language' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/location_capital_town.rb b/app/models/content_groupers/location_capital_town.rb index e0393c98..b8bf84d8 100644 --- a/app/models/content_groupers/location_capital_town.rb +++ b/app/models/content_groupers/location_capital_town.rb @@ -1,4 +1,4 @@ -class LocationCapitalTown < ActiveRecord::Base +class LocationCapitalTown < ActiveRecord belongs_to :location belongs_to :user belongs_to :capital_town, class_name: Town.name diff --git a/app/models/content_groupers/location_landmark.rb b/app/models/content_groupers/location_landmark.rb index d62b103b..985e32a7 100644 --- a/app/models/content_groupers/location_landmark.rb +++ b/app/models/content_groupers/location_landmark.rb @@ -1,4 +1,4 @@ -class LocationLandmark < ActiveRecord::Base +class LocationLandmark < ActiveRecord belongs_to :location belongs_to :landmark belongs_to :user diff --git a/app/models/content_groupers/location_languageship.rb b/app/models/content_groupers/location_languageship.rb index b47a480e..e0278c0a 100644 --- a/app/models/content_groupers/location_languageship.rb +++ b/app/models/content_groupers/location_languageship.rb @@ -1,4 +1,4 @@ -class LocationLanguageship < ActiveRecord::Base +class LocationLanguageship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/location_largest_town.rb b/app/models/content_groupers/location_largest_town.rb index ac2d6b5a..6460e527 100644 --- a/app/models/content_groupers/location_largest_town.rb +++ b/app/models/content_groupers/location_largest_town.rb @@ -1,4 +1,4 @@ -class LocationLargestTown < ActiveRecord::Base +class LocationLargestTown < ActiveRecord belongs_to :location belongs_to :user belongs_to :largest_town, class_name: Town.name diff --git a/app/models/content_groupers/location_leadership.rb b/app/models/content_groupers/location_leadership.rb index 7f1c6b41..15a7ed96 100644 --- a/app/models/content_groupers/location_leadership.rb +++ b/app/models/content_groupers/location_leadership.rb @@ -1,4 +1,4 @@ -class LocationLeadership < ActiveRecord::Base +class LocationLeadership < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/location_notable_town.rb b/app/models/content_groupers/location_notable_town.rb index ee920dcc..79cc1638 100644 --- a/app/models/content_groupers/location_notable_town.rb +++ b/app/models/content_groupers/location_notable_town.rb @@ -1,4 +1,4 @@ -class LocationNotableTown < ActiveRecord::Base +class LocationNotableTown < ActiveRecord belongs_to :location belongs_to :user belongs_to :notable_town, class_name: Town.name diff --git a/app/models/content_groupers/magic_deityship.rb b/app/models/content_groupers/magic_deityship.rb index 5eae9f0e..a1f67f98 100644 --- a/app/models/content_groupers/magic_deityship.rb +++ b/app/models/content_groupers/magic_deityship.rb @@ -1,8 +1,8 @@ -class MagicDeityship < ActiveRecord::Base +class MagicDeityship < ActiveRecord include HasContentLinking belongs_to :user belongs_to :magic belongs_to :deity, class_name: 'Character' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/maker_relationship.rb b/app/models/content_groupers/maker_relationship.rb index e3a10f09..b4f71a3c 100644 --- a/app/models/content_groupers/maker_relationship.rb +++ b/app/models/content_groupers/maker_relationship.rb @@ -1,6 +1,6 @@ # Defines a relation from an Item to the Character that created it # and an inverse relationship from a Character to all items it created -class MakerRelationship < ActiveRecord::Base +class MakerRelationship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/marriage.rb b/app/models/content_groupers/marriage.rb index 402840e7..3a6ea0f0 100644 --- a/app/models/content_groupers/marriage.rb +++ b/app/models/content_groupers/marriage.rb @@ -1,4 +1,4 @@ -class Marriage < ActiveRecord::Base +class Marriage < ActiveRecord include HasContentLinking LINK_TYPE = :two_way diff --git a/app/models/content_groupers/mothership.rb b/app/models/content_groupers/mothership.rb index 1dbb8da9..25774216 100644 --- a/app/models/content_groupers/mothership.rb +++ b/app/models/content_groupers/mothership.rb @@ -1,4 +1,4 @@ -class Mothership < ActiveRecord::Base +class Mothership < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/notable_cities_relationship.rb b/app/models/content_groupers/notable_cities_relationship.rb index 8b236e00..cb8cde4c 100644 --- a/app/models/content_groupers/notable_cities_relationship.rb +++ b/app/models/content_groupers/notable_cities_relationship.rb @@ -1,6 +1,6 @@ # Defines a relation between a location and any notable cities within it, # and a reverse relation for all locations in which a given location is notable within. -class NotableCitiesRelationship < ActiveRecord::Base +class NotableCitiesRelationship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/officeship.rb b/app/models/content_groupers/officeship.rb index 2bb04660..bb0baa09 100644 --- a/app/models/content_groupers/officeship.rb +++ b/app/models/content_groupers/officeship.rb @@ -1,8 +1,8 @@ -class Officeship < ActiveRecord::Base +class Officeship < ActiveRecord include HasContentLinking belongs_to :user belongs_to :group belongs_to :office, class_name: 'Location' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/original_ownership.rb b/app/models/content_groupers/original_ownership.rb index cf5f52d0..118da386 100644 --- a/app/models/content_groupers/original_ownership.rb +++ b/app/models/content_groupers/original_ownership.rb @@ -1,6 +1,6 @@ # Defines a relation from an Item to the Character that first owned it # and an inverse relationship from a Character to all items it first owned -class OriginalOwnership < ActiveRecord::Base +class OriginalOwnership < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/past_ownership.rb b/app/models/content_groupers/past_ownership.rb index 58c0775b..5bb217a8 100644 --- a/app/models/content_groupers/past_ownership.rb +++ b/app/models/content_groupers/past_ownership.rb @@ -1,6 +1,6 @@ # Defines a relation from an Item to a Character that previously owned it # and an inverse relationship from an Item to all Characters it has been owned by -class PastOwnership < ActiveRecord::Base +class PastOwnership < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/planet_country.rb b/app/models/content_groupers/planet_country.rb index 2b1688ab..47d0732a 100644 --- a/app/models/content_groupers/planet_country.rb +++ b/app/models/content_groupers/planet_country.rb @@ -1,4 +1,4 @@ -class PlanetCountry < ActiveRecord::Base +class PlanetCountry < ActiveRecord belongs_to :user belongs_to :planet belongs_to :country diff --git a/app/models/content_groupers/planet_creature.rb b/app/models/content_groupers/planet_creature.rb index 12632e46..cec60cbd 100644 --- a/app/models/content_groupers/planet_creature.rb +++ b/app/models/content_groupers/planet_creature.rb @@ -1,4 +1,4 @@ -class PlanetCreature < ActiveRecord::Base +class PlanetCreature < ActiveRecord belongs_to :user belongs_to :planet belongs_to :creature diff --git a/app/models/content_groupers/planet_deity.rb b/app/models/content_groupers/planet_deity.rb index c3e1d61e..03969c4f 100644 --- a/app/models/content_groupers/planet_deity.rb +++ b/app/models/content_groupers/planet_deity.rb @@ -1,4 +1,4 @@ -class PlanetDeity < ActiveRecord::Base +class PlanetDeity < ActiveRecord belongs_to :user belongs_to :planet belongs_to :deity diff --git a/app/models/content_groupers/planet_flora.rb b/app/models/content_groupers/planet_flora.rb index e8aba8ba..e0abb2cf 100644 --- a/app/models/content_groupers/planet_flora.rb +++ b/app/models/content_groupers/planet_flora.rb @@ -1,4 +1,4 @@ -class PlanetFlora < ActiveRecord::Base +class PlanetFlora < ActiveRecord belongs_to :user belongs_to :planet belongs_to :flora diff --git a/app/models/content_groupers/planet_group.rb b/app/models/content_groupers/planet_group.rb index 79d474b3..302a6d42 100644 --- a/app/models/content_groupers/planet_group.rb +++ b/app/models/content_groupers/planet_group.rb @@ -1,4 +1,4 @@ -class PlanetGroup < ActiveRecord::Base +class PlanetGroup < ActiveRecord belongs_to :user belongs_to :planet belongs_to :group diff --git a/app/models/content_groupers/planet_landmark.rb b/app/models/content_groupers/planet_landmark.rb index df064ac0..b64574a3 100644 --- a/app/models/content_groupers/planet_landmark.rb +++ b/app/models/content_groupers/planet_landmark.rb @@ -1,4 +1,4 @@ -class PlanetLandmark < ActiveRecord::Base +class PlanetLandmark < ActiveRecord belongs_to :user belongs_to :planet belongs_to :landmark diff --git a/app/models/content_groupers/planet_language.rb b/app/models/content_groupers/planet_language.rb index 9eb3e76a..82f06cdc 100644 --- a/app/models/content_groupers/planet_language.rb +++ b/app/models/content_groupers/planet_language.rb @@ -1,4 +1,4 @@ -class PlanetLanguage < ActiveRecord::Base +class PlanetLanguage < ActiveRecord belongs_to :user belongs_to :planet belongs_to :language diff --git a/app/models/content_groupers/planet_location.rb b/app/models/content_groupers/planet_location.rb index bbf176ec..f7440160 100644 --- a/app/models/content_groupers/planet_location.rb +++ b/app/models/content_groupers/planet_location.rb @@ -1,4 +1,4 @@ -class PlanetLocation < ActiveRecord::Base +class PlanetLocation < ActiveRecord belongs_to :user belongs_to :planet belongs_to :location diff --git a/app/models/content_groupers/planet_nearby_planet.rb b/app/models/content_groupers/planet_nearby_planet.rb index 748fdc8a..f9483312 100644 --- a/app/models/content_groupers/planet_nearby_planet.rb +++ b/app/models/content_groupers/planet_nearby_planet.rb @@ -1,4 +1,4 @@ -class PlanetNearbyPlanet < ActiveRecord::Base +class PlanetNearbyPlanet < ActiveRecord include HasContentLinking LINK_TYPE = :two_way diff --git a/app/models/content_groupers/planet_race.rb b/app/models/content_groupers/planet_race.rb index bb82115a..e0c28754 100644 --- a/app/models/content_groupers/planet_race.rb +++ b/app/models/content_groupers/planet_race.rb @@ -1,4 +1,4 @@ -class PlanetRace < ActiveRecord::Base +class PlanetRace < ActiveRecord belongs_to :user belongs_to :planet belongs_to :race diff --git a/app/models/content_groupers/planet_religion.rb b/app/models/content_groupers/planet_religion.rb index 0b2f9cd1..35d1f0c0 100644 --- a/app/models/content_groupers/planet_religion.rb +++ b/app/models/content_groupers/planet_religion.rb @@ -1,4 +1,4 @@ -class PlanetReligion < ActiveRecord::Base +class PlanetReligion < ActiveRecord belongs_to :user belongs_to :planet belongs_to :religion diff --git a/app/models/content_groupers/planet_town.rb b/app/models/content_groupers/planet_town.rb index dc875701..d68984cf 100644 --- a/app/models/content_groupers/planet_town.rb +++ b/app/models/content_groupers/planet_town.rb @@ -1,4 +1,4 @@ -class PlanetTown < ActiveRecord::Base +class PlanetTown < ActiveRecord belongs_to :user belongs_to :planet belongs_to :town diff --git a/app/models/content_groupers/raceship.rb b/app/models/content_groupers/raceship.rb index a868ef9d..335828e4 100644 --- a/app/models/content_groupers/raceship.rb +++ b/app/models/content_groupers/raceship.rb @@ -1,4 +1,4 @@ -class Raceship < ActiveRecord::Base +class Raceship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/religious_figureship.rb b/app/models/content_groupers/religious_figureship.rb index 537ff586..b00c5157 100644 --- a/app/models/content_groupers/religious_figureship.rb +++ b/app/models/content_groupers/religious_figureship.rb @@ -1,4 +1,4 @@ -class ReligiousFigureship < ActiveRecord::Base +class ReligiousFigureship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/religious_locationship.rb b/app/models/content_groupers/religious_locationship.rb index 4c36e2b5..aee569f3 100644 --- a/app/models/content_groupers/religious_locationship.rb +++ b/app/models/content_groupers/religious_locationship.rb @@ -1,4 +1,4 @@ -class ReligiousLocationship < ActiveRecord::Base +class ReligiousLocationship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/religious_raceship.rb b/app/models/content_groupers/religious_raceship.rb index 1e15f830..e0e64567 100644 --- a/app/models/content_groupers/religious_raceship.rb +++ b/app/models/content_groupers/religious_raceship.rb @@ -1,8 +1,8 @@ -class ReligiousRaceship < ActiveRecord::Base +class ReligiousRaceship < ActiveRecord include HasContentLinking belongs_to :user belongs_to :religion belongs_to :race -end \ No newline at end of file +end diff --git a/app/models/content_groupers/scene_charactership.rb b/app/models/content_groupers/scene_charactership.rb index 9faa7183..9d793b70 100644 --- a/app/models/content_groupers/scene_charactership.rb +++ b/app/models/content_groupers/scene_charactership.rb @@ -1,8 +1,8 @@ -class SceneCharactership < ActiveRecord::Base +class SceneCharactership < ActiveRecord include HasContentLinking belongs_to :user belongs_to :scene belongs_to :scene_character, class_name: 'Character' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/scene_itemship.rb b/app/models/content_groupers/scene_itemship.rb index 70496cc7..e775af27 100644 --- a/app/models/content_groupers/scene_itemship.rb +++ b/app/models/content_groupers/scene_itemship.rb @@ -1,8 +1,8 @@ -class SceneItemship < ActiveRecord::Base +class SceneItemship < ActiveRecord include HasContentLinking belongs_to :user belongs_to :scene belongs_to :scene_item, class_name: 'Item' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/scene_locationship.rb b/app/models/content_groupers/scene_locationship.rb index eb12ca56..bcdcd1da 100644 --- a/app/models/content_groupers/scene_locationship.rb +++ b/app/models/content_groupers/scene_locationship.rb @@ -1,8 +1,8 @@ -class SceneLocationship < ActiveRecord::Base +class SceneLocationship < ActiveRecord include HasContentLinking belongs_to :user belongs_to :scene belongs_to :scene_location, class_name: 'Location' -end \ No newline at end of file +end diff --git a/app/models/content_groupers/siblingship.rb b/app/models/content_groupers/siblingship.rb index 3133b944..79a3f1d7 100644 --- a/app/models/content_groupers/siblingship.rb +++ b/app/models/content_groupers/siblingship.rb @@ -1,4 +1,4 @@ -class Siblingship < ActiveRecord::Base +class Siblingship < ActiveRecord include HasContentLinking LINK_TYPE = :two_way diff --git a/app/models/content_groupers/sistergroupship.rb b/app/models/content_groupers/sistergroupship.rb index a5f1b22d..becb1bc0 100644 --- a/app/models/content_groupers/sistergroupship.rb +++ b/app/models/content_groupers/sistergroupship.rb @@ -1,4 +1,4 @@ -class Sistergroupship < ActiveRecord::Base +class Sistergroupship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/subgroupship.rb b/app/models/content_groupers/subgroupship.rb index bf47ed6a..aff38a0c 100644 --- a/app/models/content_groupers/subgroupship.rb +++ b/app/models/content_groupers/subgroupship.rb @@ -1,4 +1,4 @@ -class Subgroupship < ActiveRecord::Base +class Subgroupship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/supergroupship.rb b/app/models/content_groupers/supergroupship.rb index 71c3a5e3..3149b45e 100644 --- a/app/models/content_groupers/supergroupship.rb +++ b/app/models/content_groupers/supergroupship.rb @@ -1,4 +1,4 @@ -class Supergroupship < ActiveRecord::Base +class Supergroupship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/technology_character.rb b/app/models/content_groupers/technology_character.rb index 6b6c36de..553c65d2 100644 --- a/app/models/content_groupers/technology_character.rb +++ b/app/models/content_groupers/technology_character.rb @@ -1,4 +1,4 @@ -class TechnologyCharacter < ActiveRecord::Base +class TechnologyCharacter < ActiveRecord belongs_to :user belongs_to :technology belongs_to :character diff --git a/app/models/content_groupers/technology_child_technology.rb b/app/models/content_groupers/technology_child_technology.rb index 58987f81..548e27fe 100644 --- a/app/models/content_groupers/technology_child_technology.rb +++ b/app/models/content_groupers/technology_child_technology.rb @@ -1,4 +1,4 @@ -class TechnologyChildTechnology < ActiveRecord::Base +class TechnologyChildTechnology < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/technology_country.rb b/app/models/content_groupers/technology_country.rb index 0d269f39..dd296b9f 100644 --- a/app/models/content_groupers/technology_country.rb +++ b/app/models/content_groupers/technology_country.rb @@ -1,4 +1,4 @@ -class TechnologyCountry < ActiveRecord::Base +class TechnologyCountry < ActiveRecord belongs_to :user belongs_to :technology belongs_to :country diff --git a/app/models/content_groupers/technology_creature.rb b/app/models/content_groupers/technology_creature.rb index 6956ff94..543e1c78 100644 --- a/app/models/content_groupers/technology_creature.rb +++ b/app/models/content_groupers/technology_creature.rb @@ -1,4 +1,4 @@ -class TechnologyCreature < ActiveRecord::Base +class TechnologyCreature < ActiveRecord belongs_to :user belongs_to :technology belongs_to :creature diff --git a/app/models/content_groupers/technology_group.rb b/app/models/content_groupers/technology_group.rb index e0e247ad..b0151d24 100644 --- a/app/models/content_groupers/technology_group.rb +++ b/app/models/content_groupers/technology_group.rb @@ -1,4 +1,4 @@ -class TechnologyGroup < ActiveRecord::Base +class TechnologyGroup < ActiveRecord belongs_to :user belongs_to :technology belongs_to :group diff --git a/app/models/content_groupers/technology_magic.rb b/app/models/content_groupers/technology_magic.rb index aa0de9c5..db368529 100644 --- a/app/models/content_groupers/technology_magic.rb +++ b/app/models/content_groupers/technology_magic.rb @@ -1,4 +1,4 @@ -class TechnologyMagic < ActiveRecord::Base +class TechnologyMagic < ActiveRecord belongs_to :user belongs_to :technology belongs_to :magic diff --git a/app/models/content_groupers/technology_parent_technology.rb b/app/models/content_groupers/technology_parent_technology.rb index 39454c0a..21820df2 100644 --- a/app/models/content_groupers/technology_parent_technology.rb +++ b/app/models/content_groupers/technology_parent_technology.rb @@ -1,4 +1,4 @@ -class TechnologyParentTechnology < ActiveRecord::Base +class TechnologyParentTechnology < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/technology_planet.rb b/app/models/content_groupers/technology_planet.rb index 4106617b..f0f00a50 100644 --- a/app/models/content_groupers/technology_planet.rb +++ b/app/models/content_groupers/technology_planet.rb @@ -1,4 +1,4 @@ -class TechnologyPlanet < ActiveRecord::Base +class TechnologyPlanet < ActiveRecord belongs_to :user belongs_to :technology belongs_to :planet diff --git a/app/models/content_groupers/technology_related_technology.rb b/app/models/content_groupers/technology_related_technology.rb index 80f61185..993a7d14 100644 --- a/app/models/content_groupers/technology_related_technology.rb +++ b/app/models/content_groupers/technology_related_technology.rb @@ -1,4 +1,4 @@ -class TechnologyRelatedTechnology < ActiveRecord::Base +class TechnologyRelatedTechnology < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/technology_town.rb b/app/models/content_groupers/technology_town.rb index 5a1b8742..9b5f4f7a 100644 --- a/app/models/content_groupers/technology_town.rb +++ b/app/models/content_groupers/technology_town.rb @@ -1,4 +1,4 @@ -class TechnologyTown < ActiveRecord::Base +class TechnologyTown < ActiveRecord belongs_to :user belongs_to :technology belongs_to :town diff --git a/app/models/content_groupers/town_citizen.rb b/app/models/content_groupers/town_citizen.rb index 89ecfef1..79b1eb0d 100644 --- a/app/models/content_groupers/town_citizen.rb +++ b/app/models/content_groupers/town_citizen.rb @@ -1,4 +1,4 @@ -class TownCitizen < ActiveRecord::Base +class TownCitizen < ActiveRecord belongs_to :user belongs_to :town belongs_to :citizen, class_name: 'Character' diff --git a/app/models/content_groupers/town_country.rb b/app/models/content_groupers/town_country.rb index 20de024a..7ad211bd 100644 --- a/app/models/content_groupers/town_country.rb +++ b/app/models/content_groupers/town_country.rb @@ -1,4 +1,4 @@ -class TownCountry < ActiveRecord::Base +class TownCountry < ActiveRecord belongs_to :user belongs_to :town belongs_to :country diff --git a/app/models/content_groupers/town_creature.rb b/app/models/content_groupers/town_creature.rb index 23a8542b..cd05746c 100644 --- a/app/models/content_groupers/town_creature.rb +++ b/app/models/content_groupers/town_creature.rb @@ -1,4 +1,4 @@ -class TownCreature < ActiveRecord::Base +class TownCreature < ActiveRecord belongs_to :user belongs_to :town belongs_to :creature diff --git a/app/models/content_groupers/town_flora.rb b/app/models/content_groupers/town_flora.rb index 27fe5e65..2cfb6102 100644 --- a/app/models/content_groupers/town_flora.rb +++ b/app/models/content_groupers/town_flora.rb @@ -1,4 +1,4 @@ -class TownFlora < ActiveRecord::Base +class TownFlora < ActiveRecord belongs_to :user belongs_to :town belongs_to :flora diff --git a/app/models/content_groupers/town_group.rb b/app/models/content_groupers/town_group.rb index f03d23f4..d2f7a545 100644 --- a/app/models/content_groupers/town_group.rb +++ b/app/models/content_groupers/town_group.rb @@ -1,4 +1,4 @@ -class TownGroup < ActiveRecord::Base +class TownGroup < ActiveRecord belongs_to :user belongs_to :town belongs_to :group diff --git a/app/models/content_groupers/town_language.rb b/app/models/content_groupers/town_language.rb index 714fe424..7da4d92c 100644 --- a/app/models/content_groupers/town_language.rb +++ b/app/models/content_groupers/town_language.rb @@ -1,4 +1,4 @@ -class TownLanguage < ActiveRecord::Base +class TownLanguage < ActiveRecord belongs_to :user belongs_to :town belongs_to :language diff --git a/app/models/content_groupers/town_nearby_landmark.rb b/app/models/content_groupers/town_nearby_landmark.rb index d70d501f..13964e83 100644 --- a/app/models/content_groupers/town_nearby_landmark.rb +++ b/app/models/content_groupers/town_nearby_landmark.rb @@ -1,4 +1,4 @@ -class TownNearbyLandmark < ActiveRecord::Base +class TownNearbyLandmark < ActiveRecord belongs_to :user belongs_to :town belongs_to :nearby_landmark, class_name: 'Landmark' diff --git a/app/models/content_groupers/wildlifeship.rb b/app/models/content_groupers/wildlifeship.rb index 3ee3c864..f5081450 100644 --- a/app/models/content_groupers/wildlifeship.rb +++ b/app/models/content_groupers/wildlifeship.rb @@ -1,4 +1,4 @@ -class Wildlifeship < ActiveRecord::Base +class Wildlifeship < ActiveRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_types/character.rb b/app/models/content_types/character.rb index 263a75e0..ad782b6d 100644 --- a/app/models/content_types/character.rb +++ b/app/models/content_types/character.rb @@ -6,7 +6,7 @@ # 1. a person in a User's story. # # exists within a Universe. -class Character < ActiveRecord::Base +class Character < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/country.rb b/app/models/content_types/country.rb index af12cae3..e7ba5e4f 100644 --- a/app/models/content_types/country.rb +++ b/app/models/content_types/country.rb @@ -1,4 +1,4 @@ -class Country < ActiveRecord::Base +class Country < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/creature.rb b/app/models/content_types/creature.rb index 96a3edce..25b0717c 100644 --- a/app/models/content_types/creature.rb +++ b/app/models/content_types/creature.rb @@ -6,7 +6,7 @@ # 1. an animal, plant, or other wildlife occuring in a user's story # # exists within a Universe. -class Creature < ActiveRecord::Base +class Creature < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/deity.rb b/app/models/content_types/deity.rb index 5a26435e..bee8e5e2 100644 --- a/app/models/content_types/deity.rb +++ b/app/models/content_types/deity.rb @@ -1,4 +1,4 @@ -class Deity < ActiveRecord::Base +class Deity < ActiveRecord acts_as_paranoid belongs_to :user diff --git a/app/models/content_types/flora.rb b/app/models/content_types/flora.rb index 04cfc626..738d01a9 100644 --- a/app/models/content_types/flora.rb +++ b/app/models/content_types/flora.rb @@ -1,4 +1,4 @@ -class Flora < ActiveRecord::Base +class Flora < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/government.rb b/app/models/content_types/government.rb index 0194e836..28bf9ce4 100644 --- a/app/models/content_types/government.rb +++ b/app/models/content_types/government.rb @@ -1,4 +1,4 @@ -class Government < ActiveRecord::Base +class Government < ActiveRecord acts_as_paranoid belongs_to :user diff --git a/app/models/content_types/group.rb b/app/models/content_types/group.rb index 1134daaa..c17587e8 100644 --- a/app/models/content_types/group.rb +++ b/app/models/content_types/group.rb @@ -1,4 +1,4 @@ -class Group < ActiveRecord::Base +class Group < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/item.rb b/app/models/content_types/item.rb index 3a31338c..cbd64eef 100644 --- a/app/models/content_types/item.rb +++ b/app/models/content_types/item.rb @@ -6,7 +6,7 @@ # 1. the necessary items for a particular purpose. # # exists within a Universe. -class Item < ActiveRecord::Base +class Item < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/landmark.rb b/app/models/content_types/landmark.rb index 54a1931a..0b120a7a 100644 --- a/app/models/content_types/landmark.rb +++ b/app/models/content_types/landmark.rb @@ -1,4 +1,4 @@ -class Landmark < ActiveRecord::Base +class Landmark < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/language.rb b/app/models/content_types/language.rb index c253c119..c8a4e9de 100644 --- a/app/models/content_types/language.rb +++ b/app/models/content_types/language.rb @@ -1,4 +1,4 @@ -class Language < ActiveRecord::Base +class Language < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/location.rb b/app/models/content_types/location.rb index 988e5150..181e0193 100644 --- a/app/models/content_types/location.rb +++ b/app/models/content_types/location.rb @@ -6,7 +6,7 @@ # 1. a particular place or position # # exists within a Universe -class Location < ActiveRecord::Base +class Location < ActiveRecord acts_as_paranoid # todo: clear these -- not used anymore diff --git a/app/models/content_types/magic.rb b/app/models/content_types/magic.rb index 4f864dde..a6ca84c9 100644 --- a/app/models/content_types/magic.rb +++ b/app/models/content_types/magic.rb @@ -1,4 +1,4 @@ -class Magic < ActiveRecord::Base +class Magic < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/planet.rb b/app/models/content_types/planet.rb index 8a6b9346..c9750007 100644 --- a/app/models/content_types/planet.rb +++ b/app/models/content_types/planet.rb @@ -1,4 +1,4 @@ -class Planet < ActiveRecord::Base +class Planet < ActiveRecord acts_as_paranoid belongs_to :user diff --git a/app/models/content_types/race.rb b/app/models/content_types/race.rb index f30845d8..23834697 100644 --- a/app/models/content_types/race.rb +++ b/app/models/content_types/race.rb @@ -4,7 +4,7 @@ # _noun_ # # 1. each of the major divisions of sentient life, having distinct physical characteristics -class Race < ActiveRecord::Base +class Race < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/religion.rb b/app/models/content_types/religion.rb index bb2b9fe2..f0292c95 100644 --- a/app/models/content_types/religion.rb +++ b/app/models/content_types/religion.rb @@ -1,4 +1,4 @@ -class Religion < ActiveRecord::Base +class Religion < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/scene.rb b/app/models/content_types/scene.rb index 1df6411d..e3137e7d 100644 --- a/app/models/content_types/scene.rb +++ b/app/models/content_types/scene.rb @@ -1,4 +1,4 @@ -class Scene < ActiveRecord::Base +class Scene < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/technology.rb b/app/models/content_types/technology.rb index 2f3b928d..48d26d21 100644 --- a/app/models/content_types/technology.rb +++ b/app/models/content_types/technology.rb @@ -1,4 +1,4 @@ -class Technology < ActiveRecord::Base +class Technology < ActiveRecord acts_as_paranoid belongs_to :user diff --git a/app/models/content_types/town.rb b/app/models/content_types/town.rb index 647e96a9..2e7c8544 100644 --- a/app/models/content_types/town.rb +++ b/app/models/content_types/town.rb @@ -1,4 +1,4 @@ -class Town < ActiveRecord::Base +class Town < ActiveRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/universe.rb b/app/models/content_types/universe.rb index 5deb9a38..3c154b2d 100644 --- a/app/models/content_types/universe.rb +++ b/app/models/content_types/universe.rb @@ -5,7 +5,7 @@ # 1. a particular sphere of activity, interest, or experience # # contains all canonically-related content created by Users -class Universe < ActiveRecord::Base +class Universe < ActiveRecord acts_as_paranoid include HasAttributes diff --git a/app/models/contributor.rb b/app/models/contributor.rb index 0d023851..e2fb0414 100644 --- a/app/models/contributor.rb +++ b/app/models/contributor.rb @@ -1,4 +1,4 @@ -class Contributor < ActiveRecord::Base +class Contributor < ActiveRecord belongs_to :universe belongs_to :user end diff --git a/app/models/document.rb b/app/models/document.rb index e7253649..51fd7782 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -1,3 +1,3 @@ -class Document < ActiveRecord::Base +class Document < ActiveRecord belongs_to :user end diff --git a/app/models/image_upload.rb b/app/models/image_upload.rb index dbb64441..2273e2a5 100644 --- a/app/models/image_upload.rb +++ b/app/models/image_upload.rb @@ -1,4 +1,4 @@ -class ImageUpload < ActiveRecord::Base +class ImageUpload < ActiveRecord belongs_to :user has_attached_file :src, diff --git a/app/models/raffle_entry.rb b/app/models/raffle_entry.rb index 602c5e55..51fe76da 100644 --- a/app/models/raffle_entry.rb +++ b/app/models/raffle_entry.rb @@ -1,3 +1,3 @@ -class RaffleEntry < ActiveRecord::Base +class RaffleEntry < ActiveRecord belongs_to :user end diff --git a/app/models/referral.rb b/app/models/referral.rb index c10a9abc..e931c06e 100644 --- a/app/models/referral.rb +++ b/app/models/referral.rb @@ -1,4 +1,4 @@ -class Referral < ActiveRecord::Base +class Referral < ActiveRecord def referrer User.find_by(id: self.referrer_id) end diff --git a/app/models/referral_code.rb b/app/models/referral_code.rb index 88ae4dea..bb55d373 100644 --- a/app/models/referral_code.rb +++ b/app/models/referral_code.rb @@ -1,3 +1,3 @@ -class ReferralCode < ActiveRecord::Base +class ReferralCode < ActiveRecord belongs_to :user end diff --git a/app/models/stripe_event_log.rb b/app/models/stripe_event_log.rb index d649b9e5..cc47fc66 100644 --- a/app/models/stripe_event_log.rb +++ b/app/models/stripe_event_log.rb @@ -1,2 +1,2 @@ -class StripeEventLog < ActiveRecord::Base +class StripeEventLog < ActiveRecord end diff --git a/app/models/subscription.rb b/app/models/subscription.rb index ac9e48d0..4f6f2163 100644 --- a/app/models/subscription.rb +++ b/app/models/subscription.rb @@ -1,4 +1,4 @@ -class Subscription < ActiveRecord::Base +class Subscription < ActiveRecord belongs_to :user belongs_to :billing_plan end diff --git a/app/models/user.rb b/app/models/user.rb index 893b6d5d..44bd52aa 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,7 +2,7 @@ require 'digest/md5' ## # a person using the Notebook.ai web application. Owns all other content. -class User < ActiveRecord::Base +class User < ActiveRecord acts_as_paranoid # Include default devise modules. Others available are: diff --git a/app/models/user_content_type_activator.rb b/app/models/user_content_type_activator.rb index a0600911..e1d1a3df 100644 --- a/app/models/user_content_type_activator.rb +++ b/app/models/user_content_type_activator.rb @@ -1,3 +1,3 @@ -class UserContentTypeActivator < ActiveRecord::Base +class UserContentTypeActivator < ActiveRecord belongs_to :user end diff --git a/app/models/votable.rb b/app/models/votable.rb index d3e37483..579ec8bf 100644 --- a/app/models/votable.rb +++ b/app/models/votable.rb @@ -1,3 +1,3 @@ -class Votable < ActiveRecord::Base +class Votable < ActiveRecord has_many :votes end diff --git a/app/models/vote.rb b/app/models/vote.rb index e6386738..ba3a3bc2 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,4 @@ -class Vote < ActiveRecord::Base +class Vote < ActiveRecord belongs_to :user belongs_to :votable end diff --git a/config/application.rb b/config/application.rb index b197df3d..2d2ca5ac 100644 --- a/config/application.rb +++ b/config/application.rb @@ -25,8 +25,5 @@ module Notebook # Use delayed_job to process jobs config.active_job.queue_adapter = :delayed_job - - # Do not swallow errors in after_commit/after_rollback callbacks. - config.active_record.raise_in_transactional_callbacks = true end end diff --git a/db/migrate/20140713043535_create_models.rb b/db/migrate/20140713043535_create_models.rb index 3d7386b5..4df7df1d 100644 --- a/db/migrate/20140713043535_create_models.rb +++ b/db/migrate/20140713043535_create_models.rb @@ -1,4 +1,4 @@ -class CreateModels < ActiveRecord::Migration +class CreateModels < ActiveRecord::Migration[4.2] def change create_table :characters do |t| t.string :name, null: false diff --git a/db/migrate/20150419134141_add_password_digest_to_users.rb b/db/migrate/20150419134141_add_password_digest_to_users.rb index 17b82b5a..48fd3db1 100644 --- a/db/migrate/20150419134141_add_password_digest_to_users.rb +++ b/db/migrate/20150419134141_add_password_digest_to_users.rb @@ -1,4 +1,4 @@ -class AddPasswordDigestToUsers < ActiveRecord::Migration +class AddPasswordDigestToUsers < ActiveRecord::Migration[4.2] def change rename_column :users, :password, :old_password change_column_null :users, :old_password, true diff --git a/db/migrate/20160405035806_add_devise_to_users.rb b/db/migrate/20160405035806_add_devise_to_users.rb index 8c1cba49..95722c84 100644 --- a/db/migrate/20160405035806_add_devise_to_users.rb +++ b/db/migrate/20160405035806_add_devise_to_users.rb @@ -1,4 +1,4 @@ -class AddDeviseToUsers < ActiveRecord::Migration +class AddDeviseToUsers < ActiveRecord::Migration[4.2] def self.up change_table(:users) do |t| ## Database authenticatable diff --git a/db/migrate/20160429190058_create_siblingships.rb b/db/migrate/20160429190058_create_siblingships.rb index 0cb84776..4c926f7b 100644 --- a/db/migrate/20160429190058_create_siblingships.rb +++ b/db/migrate/20160429190058_create_siblingships.rb @@ -1,4 +1,4 @@ -class CreateSiblingships < ActiveRecord::Migration +class CreateSiblingships < ActiveRecord::Migration[4.2] def change create_table :siblingships do |t| t.integer :user_id diff --git a/db/migrate/20160503180503_create_fatherships.rb b/db/migrate/20160503180503_create_fatherships.rb index 031fbdaa..954f756f 100644 --- a/db/migrate/20160503180503_create_fatherships.rb +++ b/db/migrate/20160503180503_create_fatherships.rb @@ -1,4 +1,4 @@ -class CreateFatherships < ActiveRecord::Migration +class CreateFatherships < ActiveRecord::Migration[4.2] def change create_table :fatherships do |t| t.integer :user_id diff --git a/db/migrate/20160503183859_create_motherships.rb b/db/migrate/20160503183859_create_motherships.rb index 4b1ae578..b9140920 100644 --- a/db/migrate/20160503183859_create_motherships.rb +++ b/db/migrate/20160503183859_create_motherships.rb @@ -1,4 +1,4 @@ -class CreateMotherships < ActiveRecord::Migration +class CreateMotherships < ActiveRecord::Migration[4.2] def change create_table :motherships do |t| t.integer :user_id diff --git a/db/migrate/20160503192938_create_best_friendships.rb b/db/migrate/20160503192938_create_best_friendships.rb index 0df06fff..d6d8345d 100644 --- a/db/migrate/20160503192938_create_best_friendships.rb +++ b/db/migrate/20160503192938_create_best_friendships.rb @@ -1,4 +1,4 @@ -class CreateBestFriendships < ActiveRecord::Migration +class CreateBestFriendships < ActiveRecord::Migration[4.2] def change create_table :best_friendships do |t| t.integer :user_id diff --git a/db/migrate/20160503193513_create_marriages.rb b/db/migrate/20160503193513_create_marriages.rb index 48ad12c0..1f47d51f 100644 --- a/db/migrate/20160503193513_create_marriages.rb +++ b/db/migrate/20160503193513_create_marriages.rb @@ -1,4 +1,4 @@ -class CreateMarriages < ActiveRecord::Migration +class CreateMarriages < ActiveRecord::Migration[4.2] def change create_table :marriages do |t| t.integer :user_id diff --git a/db/migrate/20160503193541_create_archenemyships.rb b/db/migrate/20160503193541_create_archenemyships.rb index 4d41bc27..6c931a67 100644 --- a/db/migrate/20160503193541_create_archenemyships.rb +++ b/db/migrate/20160503193541_create_archenemyships.rb @@ -1,4 +1,4 @@ -class CreateArchenemyships < ActiveRecord::Migration +class CreateArchenemyships < ActiveRecord::Migration[4.2] def change create_table :archenemyships do |t| t.integer :user_id diff --git a/db/migrate/20160503201328_create_birthings.rb b/db/migrate/20160503201328_create_birthings.rb index 63bb69eb..7779014c 100644 --- a/db/migrate/20160503201328_create_birthings.rb +++ b/db/migrate/20160503201328_create_birthings.rb @@ -1,4 +1,4 @@ -class CreateBirthings < ActiveRecord::Migration +class CreateBirthings < ActiveRecord::Migration[4.2] def change create_table :birthings do |t| t.integer :character_id diff --git a/db/migrate/20160503205001_create_ownerships.rb b/db/migrate/20160503205001_create_ownerships.rb index b1c70ff5..1e2de59a 100644 --- a/db/migrate/20160503205001_create_ownerships.rb +++ b/db/migrate/20160503205001_create_ownerships.rb @@ -1,4 +1,4 @@ -class CreateOwnerships < ActiveRecord::Migration +class CreateOwnerships < ActiveRecord::Migration[4.2] def change create_table :ownerships do |t| t.integer :character_id diff --git a/db/migrate/20160806064053_create_childrenships.rb b/db/migrate/20160806064053_create_childrenships.rb index ca427a43..a1de6fa2 100644 --- a/db/migrate/20160806064053_create_childrenships.rb +++ b/db/migrate/20160806064053_create_childrenships.rb @@ -1,4 +1,4 @@ -class CreateChildrenships < ActiveRecord::Migration +class CreateChildrenships < ActiveRecord::Migration[4.2] def change create_table :childrenships do |t| t.integer :user_id diff --git a/db/migrate/20160903220122_create_largest_cities_relationships.rb b/db/migrate/20160903220122_create_largest_cities_relationships.rb index 24bca255..46de650e 100644 --- a/db/migrate/20160903220122_create_largest_cities_relationships.rb +++ b/db/migrate/20160903220122_create_largest_cities_relationships.rb @@ -1,4 +1,4 @@ -class CreateLargestCitiesRelationships < ActiveRecord::Migration +class CreateLargestCitiesRelationships < ActiveRecord::Migration[4.2] def change create_table :largest_cities_relationships do |t| t.integer :user_id diff --git a/db/migrate/20160903221005_create_notable_cities_relationships.rb b/db/migrate/20160903221005_create_notable_cities_relationships.rb index 6298aa5e..2f3a3e17 100644 --- a/db/migrate/20160903221005_create_notable_cities_relationships.rb +++ b/db/migrate/20160903221005_create_notable_cities_relationships.rb @@ -1,4 +1,4 @@ -class CreateNotableCitiesRelationships < ActiveRecord::Migration +class CreateNotableCitiesRelationships < ActiveRecord::Migration[4.2] def change create_table :notable_cities_relationships do |t| t.integer :user_id diff --git a/db/migrate/20160903221349_create_capital_cities_relationships.rb b/db/migrate/20160903221349_create_capital_cities_relationships.rb index 9ff1db7e..8b08399c 100644 --- a/db/migrate/20160903221349_create_capital_cities_relationships.rb +++ b/db/migrate/20160903221349_create_capital_cities_relationships.rb @@ -1,4 +1,4 @@ -class CreateCapitalCitiesRelationships < ActiveRecord::Migration +class CreateCapitalCitiesRelationships < ActiveRecord::Migration[4.2] def change create_table :capital_cities_relationships do |t| t.integer :user_id diff --git a/db/migrate/20160903221819_create_location_leaderships.rb b/db/migrate/20160903221819_create_location_leaderships.rb index 914eeef5..2f5c21e7 100644 --- a/db/migrate/20160903221819_create_location_leaderships.rb +++ b/db/migrate/20160903221819_create_location_leaderships.rb @@ -1,4 +1,4 @@ -class CreateLocationLeaderships < ActiveRecord::Migration +class CreateLocationLeaderships < ActiveRecord::Migration[4.2] def change create_table :location_leaderships do |t| t.integer :user_id diff --git a/db/migrate/20160903222311_create_original_ownership.rb b/db/migrate/20160903222311_create_original_ownership.rb index 253a9ff0..e41b0207 100644 --- a/db/migrate/20160903222311_create_original_ownership.rb +++ b/db/migrate/20160903222311_create_original_ownership.rb @@ -1,4 +1,4 @@ -class CreateOriginalOwnership < ActiveRecord::Migration +class CreateOriginalOwnership < ActiveRecord::Migration[4.2] def change create_table :original_ownerships do |t| t.integer :user_id diff --git a/db/migrate/20160903222537_create_current_ownership.rb b/db/migrate/20160903222537_create_current_ownership.rb index f2e622e5..56eb176d 100644 --- a/db/migrate/20160903222537_create_current_ownership.rb +++ b/db/migrate/20160903222537_create_current_ownership.rb @@ -1,4 +1,4 @@ -class CreateCurrentOwnership < ActiveRecord::Migration +class CreateCurrentOwnership < ActiveRecord::Migration[4.2] def change create_table :current_ownerships do |t| t.integer :user_id diff --git a/db/migrate/20160903223957_create_maker_relationship.rb b/db/migrate/20160903223957_create_maker_relationship.rb index 0710c1f5..cd045d38 100644 --- a/db/migrate/20160903223957_create_maker_relationship.rb +++ b/db/migrate/20160903223957_create_maker_relationship.rb @@ -1,4 +1,4 @@ -class CreateMakerRelationship < ActiveRecord::Migration +class CreateMakerRelationship < ActiveRecord::Migration[4.2] def change create_table :maker_relationships do |t| t.integer :user_id diff --git a/db/migrate/20160920180129_add_privacy_to_characters.rb b/db/migrate/20160920180129_add_privacy_to_characters.rb index 3cc4f120..c2fa33d2 100644 --- a/db/migrate/20160920180129_add_privacy_to_characters.rb +++ b/db/migrate/20160920180129_add_privacy_to_characters.rb @@ -1,4 +1,4 @@ -class AddPrivacyToCharacters < ActiveRecord::Migration +class AddPrivacyToCharacters < ActiveRecord::Migration[4.2] def change add_column :characters, :privacy, :string end diff --git a/db/migrate/20160922204302_add_privacy_to_items.rb b/db/migrate/20160922204302_add_privacy_to_items.rb index cb6538a5..5c3cd5cb 100644 --- a/db/migrate/20160922204302_add_privacy_to_items.rb +++ b/db/migrate/20160922204302_add_privacy_to_items.rb @@ -1,4 +1,4 @@ -class AddPrivacyToItems < ActiveRecord::Migration +class AddPrivacyToItems < ActiveRecord::Migration[4.2] def change add_column :items, :privacy, :string, default: 'private', null: false end diff --git a/db/migrate/20160922204317_add_privacy_to_locations.rb b/db/migrate/20160922204317_add_privacy_to_locations.rb index 37983a9f..510b8b5e 100644 --- a/db/migrate/20160922204317_add_privacy_to_locations.rb +++ b/db/migrate/20160922204317_add_privacy_to_locations.rb @@ -1,4 +1,4 @@ -class AddPrivacyToLocations < ActiveRecord::Migration +class AddPrivacyToLocations < ActiveRecord::Migration[4.2] def change add_column :locations, :privacy, :string, default: 'private', null: false end diff --git a/db/migrate/20161001232324_create_past_ownership.rb b/db/migrate/20161001232324_create_past_ownership.rb index 99581da7..2db05a62 100644 --- a/db/migrate/20161001232324_create_past_ownership.rb +++ b/db/migrate/20161001232324_create_past_ownership.rb @@ -1,4 +1,4 @@ -class CreatePastOwnership < ActiveRecord::Migration +class CreatePastOwnership < ActiveRecord::Migration[4.2] def change create_table :past_ownerships do |t| t.integer :user_id diff --git a/db/migrate/20161003000856_add_archetype_to_character.rb b/db/migrate/20161003000856_add_archetype_to_character.rb index 6aa67993..81399f37 100644 --- a/db/migrate/20161003000856_add_archetype_to_character.rb +++ b/db/migrate/20161003000856_add_archetype_to_character.rb @@ -1,4 +1,4 @@ -class AddArchetypeToCharacter < ActiveRecord::Migration +class AddArchetypeToCharacter < ActiveRecord::Migration[4.2] def change add_column :characters, :archetype, :string end diff --git a/db/migrate/20161003183741_create_attributes.rb b/db/migrate/20161003183741_create_attributes.rb index 736416b8..7e581929 100644 --- a/db/migrate/20161003183741_create_attributes.rb +++ b/db/migrate/20161003183741_create_attributes.rb @@ -1,4 +1,4 @@ -class CreateAttributes < ActiveRecord::Migration +class CreateAttributes < ActiveRecord::Migration[4.2] def change create_table :attribute_categories do |t| t.belongs_to :user diff --git a/db/migrate/20161005111959_add_fields_to_universe.rb b/db/migrate/20161005111959_add_fields_to_universe.rb index a160bafe..add67081 100644 --- a/db/migrate/20161005111959_add_fields_to_universe.rb +++ b/db/migrate/20161005111959_add_fields_to_universe.rb @@ -1,4 +1,4 @@ -class AddFieldsToUniverse < ActiveRecord::Migration +class AddFieldsToUniverse < ActiveRecord::Migration[4.2] def change add_column :universes, :laws_of_physics, :string add_column :universes, :magic_system, :string diff --git a/db/migrate/20161005115303_add_fields_to_character.rb b/db/migrate/20161005115303_add_fields_to_character.rb index 6e0238ce..11afc1eb 100644 --- a/db/migrate/20161005115303_add_fields_to_character.rb +++ b/db/migrate/20161005115303_add_fields_to_character.rb @@ -1,4 +1,4 @@ -class AddFieldsToCharacter < ActiveRecord::Migration +class AddFieldsToCharacter < ActiveRecord::Migration[4.2] def change add_column :characters, :aliases, :string add_column :characters, :motivations, :string diff --git a/db/migrate/20161005120615_add_fields_to_location.rb b/db/migrate/20161005120615_add_fields_to_location.rb index ea2a3b82..4d8e3ee6 100644 --- a/db/migrate/20161005120615_add_fields_to_location.rb +++ b/db/migrate/20161005120615_add_fields_to_location.rb @@ -1,4 +1,4 @@ -class AddFieldsToLocation < ActiveRecord::Migration +class AddFieldsToLocation < ActiveRecord::Migration[4.2] def change add_column :locations, :laws, :string add_column :locations, :climate, :string diff --git a/db/migrate/20161014204501_create_creatures.rb b/db/migrate/20161014204501_create_creatures.rb index 1ff5ea0f..acec6d4e 100644 --- a/db/migrate/20161014204501_create_creatures.rb +++ b/db/migrate/20161014204501_create_creatures.rb @@ -1,4 +1,4 @@ -class CreateCreatures < ActiveRecord::Migration +class CreateCreatures < ActiveRecord::Migration[4.2] def change create_table :creatures do |t| t.string :name diff --git a/db/migrate/20161014210509_add_user_id_to_creatures.rb b/db/migrate/20161014210509_add_user_id_to_creatures.rb index b4bb2563..33e80a88 100644 --- a/db/migrate/20161014210509_add_user_id_to_creatures.rb +++ b/db/migrate/20161014210509_add_user_id_to_creatures.rb @@ -1,4 +1,4 @@ -class AddUserIdToCreatures < ActiveRecord::Migration +class AddUserIdToCreatures < ActiveRecord::Migration[4.2] def change add_column :creatures, :user_id, :integer end diff --git a/db/migrate/20161014220538_create_race.rb b/db/migrate/20161014220538_create_race.rb index a4f0377e..fb410e1b 100644 --- a/db/migrate/20161014220538_create_race.rb +++ b/db/migrate/20161014220538_create_race.rb @@ -1,4 +1,4 @@ -class CreateRace < ActiveRecord::Migration +class CreateRace < ActiveRecord::Migration[4.2] def change create_table :races do |t| t.string :name diff --git a/db/migrate/20161014223701_create_religions.rb b/db/migrate/20161014223701_create_religions.rb index e30d34ef..cec06132 100644 --- a/db/migrate/20161014223701_create_religions.rb +++ b/db/migrate/20161014223701_create_religions.rb @@ -1,4 +1,4 @@ -class CreateReligions < ActiveRecord::Migration +class CreateReligions < ActiveRecord::Migration[4.2] def change create_table :religions do |t| t.string :name diff --git a/db/migrate/20161016211328_create_magics.rb b/db/migrate/20161016211328_create_magics.rb index bd3bf443..6c0b9c4c 100644 --- a/db/migrate/20161016211328_create_magics.rb +++ b/db/migrate/20161016211328_create_magics.rb @@ -1,4 +1,4 @@ -class CreateMagics < ActiveRecord::Migration +class CreateMagics < ActiveRecord::Migration[4.2] def change create_table :magics do |t| t.string :name diff --git a/db/migrate/20161016213335_create_languages.rb b/db/migrate/20161016213335_create_languages.rb index 52174ee1..a4946d22 100644 --- a/db/migrate/20161016213335_create_languages.rb +++ b/db/migrate/20161016213335_create_languages.rb @@ -1,4 +1,4 @@ -class CreateLanguages < ActiveRecord::Migration +class CreateLanguages < ActiveRecord::Migration[4.2] def change create_table :languages do |t| t.string :name diff --git a/db/migrate/20161016220220_create_scenes.rb b/db/migrate/20161016220220_create_scenes.rb index 819edeb5..b36c8cd3 100644 --- a/db/migrate/20161016220220_create_scenes.rb +++ b/db/migrate/20161016220220_create_scenes.rb @@ -1,4 +1,4 @@ -class CreateScenes < ActiveRecord::Migration +class CreateScenes < ActiveRecord::Migration[4.2] def change create_table :scenes do |t| t.integer :scene_number diff --git a/db/migrate/20161016222100_create_groups.rb b/db/migrate/20161016222100_create_groups.rb index e93786ee..a2a37e66 100644 --- a/db/migrate/20161016222100_create_groups.rb +++ b/db/migrate/20161016222100_create_groups.rb @@ -1,4 +1,4 @@ -class CreateGroups < ActiveRecord::Migration +class CreateGroups < ActiveRecord::Migration[4.2] def change create_table :groups do |t| t.string :name diff --git a/db/migrate/20161021103850_create_wildlifeship.rb b/db/migrate/20161021103850_create_wildlifeship.rb index c6a78565..6573a1b9 100644 --- a/db/migrate/20161021103850_create_wildlifeship.rb +++ b/db/migrate/20161021103850_create_wildlifeship.rb @@ -1,4 +1,4 @@ -class CreateWildlifeship < ActiveRecord::Migration +class CreateWildlifeship < ActiveRecord::Migration[4.2] def change create_table :wildlifeships do |t| t.integer :user_id diff --git a/db/migrate/20161021113013_add_notes_to_creatures.rb b/db/migrate/20161021113013_add_notes_to_creatures.rb index b81aa555..7172e49b 100644 --- a/db/migrate/20161021113013_add_notes_to_creatures.rb +++ b/db/migrate/20161021113013_add_notes_to_creatures.rb @@ -1,4 +1,4 @@ -class AddNotesToCreatures < ActiveRecord::Migration +class AddNotesToCreatures < ActiveRecord::Migration[4.2] def change add_column :creatures, :notes, :string add_column :creatures, :private_notes, :string diff --git a/db/migrate/20161021114135_add_privacy_to_creatures.rb b/db/migrate/20161021114135_add_privacy_to_creatures.rb index c24b288b..6860feae 100644 --- a/db/migrate/20161021114135_add_privacy_to_creatures.rb +++ b/db/migrate/20161021114135_add_privacy_to_creatures.rb @@ -1,4 +1,4 @@ -class AddPrivacyToCreatures < ActiveRecord::Migration +class AddPrivacyToCreatures < ActiveRecord::Migration[4.2] def change add_column :creatures, :privacy, :string end diff --git a/db/migrate/20161021202915_create_famous_figureship.rb b/db/migrate/20161021202915_create_famous_figureship.rb index 0715eeab..cae4d01a 100644 --- a/db/migrate/20161021202915_create_famous_figureship.rb +++ b/db/migrate/20161021202915_create_famous_figureship.rb @@ -1,4 +1,4 @@ -class CreateFamousFigureship < ActiveRecord::Migration +class CreateFamousFigureship < ActiveRecord::Migration[4.2] def change create_table :famous_figureships do |t| t.integer :user_id diff --git a/db/migrate/20161021211814_remove_password_digest_from_users.rb b/db/migrate/20161021211814_remove_password_digest_from_users.rb index 0559b232..3ad02f3e 100644 --- a/db/migrate/20161021211814_remove_password_digest_from_users.rb +++ b/db/migrate/20161021211814_remove_password_digest_from_users.rb @@ -1,4 +1,4 @@ -class RemovePasswordDigestFromUsers < ActiveRecord::Migration +class RemovePasswordDigestFromUsers < ActiveRecord::Migration[4.2] def change remove_column :users, :password_digest, :string end diff --git a/db/migrate/20161021220223_create_raceships.rb b/db/migrate/20161021220223_create_raceships.rb index dd0785b7..f5635274 100644 --- a/db/migrate/20161021220223_create_raceships.rb +++ b/db/migrate/20161021220223_create_raceships.rb @@ -1,4 +1,4 @@ -class CreateRaceships < ActiveRecord::Migration +class CreateRaceships < ActiveRecord::Migration[4.2] def change create_table :raceships do |t| t.integer :user_id diff --git a/db/migrate/20161021225347_create_religious_figureships.rb b/db/migrate/20161021225347_create_religious_figureships.rb index 613660df..37034a45 100644 --- a/db/migrate/20161021225347_create_religious_figureships.rb +++ b/db/migrate/20161021225347_create_religious_figureships.rb @@ -1,4 +1,4 @@ -class CreateReligiousFigureships < ActiveRecord::Migration +class CreateReligiousFigureships < ActiveRecord::Migration[4.2] def change create_table :religious_figureships do |t| t.integer :religion_id diff --git a/db/migrate/20161021225944_create_deityships.rb b/db/migrate/20161021225944_create_deityships.rb index b44e265c..dba517f0 100644 --- a/db/migrate/20161021225944_create_deityships.rb +++ b/db/migrate/20161021225944_create_deityships.rb @@ -1,4 +1,4 @@ -class CreateDeityships < ActiveRecord::Migration +class CreateDeityships < ActiveRecord::Migration[4.2] def change create_table :deityships do |t| t.integer :religion_id diff --git a/db/migrate/20161021230205_create_religious_locationships.rb b/db/migrate/20161021230205_create_religious_locationships.rb index 214002ed..d4fc17bd 100644 --- a/db/migrate/20161021230205_create_religious_locationships.rb +++ b/db/migrate/20161021230205_create_religious_locationships.rb @@ -1,4 +1,4 @@ -class CreateReligiousLocationships < ActiveRecord::Migration +class CreateReligiousLocationships < ActiveRecord::Migration[4.2] def change create_table :religious_locationships do |t| t.integer :religion_id diff --git a/db/migrate/20161021230419_create_artifactship.rb b/db/migrate/20161021230419_create_artifactship.rb index 8953d28f..2fb81a94 100644 --- a/db/migrate/20161021230419_create_artifactship.rb +++ b/db/migrate/20161021230419_create_artifactship.rb @@ -1,4 +1,4 @@ -class CreateArtifactship < ActiveRecord::Migration +class CreateArtifactship < ActiveRecord::Migration[4.2] def change create_table :artifactships do |t| t.integer :religion_id diff --git a/db/migrate/20161021230626_create_religious_raceship.rb b/db/migrate/20161021230626_create_religious_raceship.rb index 303240e7..8ee8c8d5 100644 --- a/db/migrate/20161021230626_create_religious_raceship.rb +++ b/db/migrate/20161021230626_create_religious_raceship.rb @@ -1,4 +1,4 @@ -class CreateReligiousRaceship < ActiveRecord::Migration +class CreateReligiousRaceship < ActiveRecord::Migration[4.2] def change create_table :religious_raceships do |t| t.integer :religion_id diff --git a/db/migrate/20161024122250_create_group_leaderships.rb b/db/migrate/20161024122250_create_group_leaderships.rb index 316a1441..850d2593 100644 --- a/db/migrate/20161024122250_create_group_leaderships.rb +++ b/db/migrate/20161024122250_create_group_leaderships.rb @@ -1,4 +1,4 @@ -class CreateGroupLeaderships < ActiveRecord::Migration +class CreateGroupLeaderships < ActiveRecord::Migration[4.2] def change create_table :group_leaderships do |t| t.integer :user_id diff --git a/db/migrate/20161024123021_create_supergroupships.rb b/db/migrate/20161024123021_create_supergroupships.rb index 43989486..1e603702 100644 --- a/db/migrate/20161024123021_create_supergroupships.rb +++ b/db/migrate/20161024123021_create_supergroupships.rb @@ -1,4 +1,4 @@ -class CreateSupergroupships < ActiveRecord::Migration +class CreateSupergroupships < ActiveRecord::Migration[4.2] def change create_table :supergroupships do |t| t.integer :user_id diff --git a/db/migrate/20161024123040_create_subgroupships.rb b/db/migrate/20161024123040_create_subgroupships.rb index a306b507..fc21e0f1 100644 --- a/db/migrate/20161024123040_create_subgroupships.rb +++ b/db/migrate/20161024123040_create_subgroupships.rb @@ -1,4 +1,4 @@ -class CreateSubgroupships < ActiveRecord::Migration +class CreateSubgroupships < ActiveRecord::Migration[4.2] def change create_table :subgroupships do |t| t.integer :user_id diff --git a/db/migrate/20161024123105_create_sistergroupships.rb b/db/migrate/20161024123105_create_sistergroupships.rb index 3dd0d9d4..c0993279 100644 --- a/db/migrate/20161024123105_create_sistergroupships.rb +++ b/db/migrate/20161024123105_create_sistergroupships.rb @@ -1,4 +1,4 @@ -class CreateSistergroupships < ActiveRecord::Migration +class CreateSistergroupships < ActiveRecord::Migration[4.2] def change create_table :sistergroupships do |t| t.integer :user_id diff --git a/db/migrate/20161024123140_create_group_allyships.rb b/db/migrate/20161024123140_create_group_allyships.rb index 2de13da5..c845c2d7 100644 --- a/db/migrate/20161024123140_create_group_allyships.rb +++ b/db/migrate/20161024123140_create_group_allyships.rb @@ -1,4 +1,4 @@ -class CreateGroupAllyships < ActiveRecord::Migration +class CreateGroupAllyships < ActiveRecord::Migration[4.2] def change create_table :group_allyships do |t| t.integer :user_id diff --git a/db/migrate/20161024123157_create_group_enemyships.rb b/db/migrate/20161024123157_create_group_enemyships.rb index b3112739..ad6ccc0c 100644 --- a/db/migrate/20161024123157_create_group_enemyships.rb +++ b/db/migrate/20161024123157_create_group_enemyships.rb @@ -1,4 +1,4 @@ -class CreateGroupEnemyships < ActiveRecord::Migration +class CreateGroupEnemyships < ActiveRecord::Migration[4.2] def change create_table :group_enemyships do |t| t.integer :user_id diff --git a/db/migrate/20161024123208_create_group_rivalships.rb b/db/migrate/20161024123208_create_group_rivalships.rb index a05ea5fd..ebac54b3 100644 --- a/db/migrate/20161024123208_create_group_rivalships.rb +++ b/db/migrate/20161024123208_create_group_rivalships.rb @@ -1,4 +1,4 @@ -class CreateGroupRivalships < ActiveRecord::Migration +class CreateGroupRivalships < ActiveRecord::Migration[4.2] def change create_table :group_rivalships do |t| t.integer :user_id diff --git a/db/migrate/20161024123232_create_group_clientships.rb b/db/migrate/20161024123232_create_group_clientships.rb index 45a06e69..cb62d471 100644 --- a/db/migrate/20161024123232_create_group_clientships.rb +++ b/db/migrate/20161024123232_create_group_clientships.rb @@ -1,4 +1,4 @@ -class CreateGroupClientships < ActiveRecord::Migration +class CreateGroupClientships < ActiveRecord::Migration[4.2] def change create_table :group_clientships do |t| t.integer :user_id diff --git a/db/migrate/20161024123248_create_group_suppierships.rb b/db/migrate/20161024123248_create_group_suppierships.rb index b266922b..78ceb30d 100644 --- a/db/migrate/20161024123248_create_group_suppierships.rb +++ b/db/migrate/20161024123248_create_group_suppierships.rb @@ -1,4 +1,4 @@ -class CreateGroupSuppierships < ActiveRecord::Migration +class CreateGroupSuppierships < ActiveRecord::Migration[4.2] def change create_table :group_supplierships do |t| t.integer :user_id diff --git a/db/migrate/20161024123312_create_headquarterships.rb b/db/migrate/20161024123312_create_headquarterships.rb index 1f2c183b..145077e9 100644 --- a/db/migrate/20161024123312_create_headquarterships.rb +++ b/db/migrate/20161024123312_create_headquarterships.rb @@ -1,4 +1,4 @@ -class CreateHeadquarterships < ActiveRecord::Migration +class CreateHeadquarterships < ActiveRecord::Migration[4.2] def change create_table :headquarterships do |t| t.integer :user_id diff --git a/db/migrate/20161024123325_create_officeships.rb b/db/migrate/20161024123325_create_officeships.rb index 20f69c1a..d17c7596 100644 --- a/db/migrate/20161024123325_create_officeships.rb +++ b/db/migrate/20161024123325_create_officeships.rb @@ -1,4 +1,4 @@ -class CreateOfficeships < ActiveRecord::Migration +class CreateOfficeships < ActiveRecord::Migration[4.2] def change create_table :officeships do |t| t.integer :user_id diff --git a/db/migrate/20161024123345_create_group_equipmentships.rb b/db/migrate/20161024123345_create_group_equipmentships.rb index 0e60db75..06a9c7b5 100644 --- a/db/migrate/20161024123345_create_group_equipmentships.rb +++ b/db/migrate/20161024123345_create_group_equipmentships.rb @@ -1,4 +1,4 @@ -class CreateGroupEquipmentships < ActiveRecord::Migration +class CreateGroupEquipmentships < ActiveRecord::Migration[4.2] def change create_table :group_equipmentships do |t| t.integer :user_id diff --git a/db/migrate/20161024123400_create_key_itemships.rb b/db/migrate/20161024123400_create_key_itemships.rb index 38e7b0f8..767f6358 100644 --- a/db/migrate/20161024123400_create_key_itemships.rb +++ b/db/migrate/20161024123400_create_key_itemships.rb @@ -1,4 +1,4 @@ -class CreateKeyItemships < ActiveRecord::Migration +class CreateKeyItemships < ActiveRecord::Migration[4.2] def change create_table :key_itemships do |t| t.integer :user_id diff --git a/db/migrate/20161024195442_create_magic_deityship.rb b/db/migrate/20161024195442_create_magic_deityship.rb index 56250ed2..53f1f5cd 100644 --- a/db/migrate/20161024195442_create_magic_deityship.rb +++ b/db/migrate/20161024195442_create_magic_deityship.rb @@ -1,4 +1,4 @@ -class CreateMagicDeityship < ActiveRecord::Migration +class CreateMagicDeityship < ActiveRecord::Migration[4.2] def change create_table :magic_deityships do |t| t.integer :user_id diff --git a/db/migrate/20161024202657_create_lingualism.rb b/db/migrate/20161024202657_create_lingualism.rb index 162d4310..99c44086 100644 --- a/db/migrate/20161024202657_create_lingualism.rb +++ b/db/migrate/20161024202657_create_lingualism.rb @@ -1,4 +1,4 @@ -class CreateLingualism < ActiveRecord::Migration +class CreateLingualism < ActiveRecord::Migration[4.2] def change create_table :lingualisms do |t| t.integer :user_id diff --git a/db/migrate/20161024204744_create_scene_characterships.rb b/db/migrate/20161024204744_create_scene_characterships.rb index cf0a0479..67eb0f4a 100644 --- a/db/migrate/20161024204744_create_scene_characterships.rb +++ b/db/migrate/20161024204744_create_scene_characterships.rb @@ -1,4 +1,4 @@ -class CreateSceneCharacterships < ActiveRecord::Migration +class CreateSceneCharacterships < ActiveRecord::Migration[4.2] def change create_table :scene_characterships do |t| t.integer :user_id diff --git a/db/migrate/20161024204806_create_scene_locationships.rb b/db/migrate/20161024204806_create_scene_locationships.rb index 311033c4..c7649ea0 100644 --- a/db/migrate/20161024204806_create_scene_locationships.rb +++ b/db/migrate/20161024204806_create_scene_locationships.rb @@ -1,4 +1,4 @@ -class CreateSceneLocationships < ActiveRecord::Migration +class CreateSceneLocationships < ActiveRecord::Migration[4.2] def change create_table :scene_locationships do |t| t.integer :user_id diff --git a/db/migrate/20161024204826_create_scene_itemships.rb b/db/migrate/20161024204826_create_scene_itemships.rb index 2ba7d25a..ab9c875e 100644 --- a/db/migrate/20161024204826_create_scene_itemships.rb +++ b/db/migrate/20161024204826_create_scene_itemships.rb @@ -1,4 +1,4 @@ -class CreateSceneItemships < ActiveRecord::Migration +class CreateSceneItemships < ActiveRecord::Migration[4.2] def change create_table :scene_itemships do |t| t.integer :user_id diff --git a/db/migrate/20161029224240_add_privacy_to_races.rb b/db/migrate/20161029224240_add_privacy_to_races.rb index 09e9587f..af7aada8 100644 --- a/db/migrate/20161029224240_add_privacy_to_races.rb +++ b/db/migrate/20161029224240_add_privacy_to_races.rb @@ -1,4 +1,4 @@ -class AddPrivacyToRaces < ActiveRecord::Migration +class AddPrivacyToRaces < ActiveRecord::Migration[4.2] def change add_column :races, :privacy, :string end diff --git a/db/migrate/20161029224408_add_privacy_to_religions.rb b/db/migrate/20161029224408_add_privacy_to_religions.rb index a63f2d6a..52228bcf 100644 --- a/db/migrate/20161029224408_add_privacy_to_religions.rb +++ b/db/migrate/20161029224408_add_privacy_to_religions.rb @@ -1,4 +1,4 @@ -class AddPrivacyToReligions < ActiveRecord::Migration +class AddPrivacyToReligions < ActiveRecord::Migration[4.2] def change add_column :religions, :privacy, :string end diff --git a/db/migrate/20161029224502_add_privacy_to_magics.rb b/db/migrate/20161029224502_add_privacy_to_magics.rb index d7edcbb6..6a41f230 100644 --- a/db/migrate/20161029224502_add_privacy_to_magics.rb +++ b/db/migrate/20161029224502_add_privacy_to_magics.rb @@ -1,4 +1,4 @@ -class AddPrivacyToMagics < ActiveRecord::Migration +class AddPrivacyToMagics < ActiveRecord::Migration[4.2] def change add_column :magics, :privacy, :string end diff --git a/db/migrate/20161029224540_add_privacy_to_languages.rb b/db/migrate/20161029224540_add_privacy_to_languages.rb index 4bc35a07..791fb36d 100644 --- a/db/migrate/20161029224540_add_privacy_to_languages.rb +++ b/db/migrate/20161029224540_add_privacy_to_languages.rb @@ -1,4 +1,4 @@ -class AddPrivacyToLanguages < ActiveRecord::Migration +class AddPrivacyToLanguages < ActiveRecord::Migration[4.2] def change add_column :languages, :privacy, :string end diff --git a/db/migrate/20161029224631_add_privacy_to_groups.rb b/db/migrate/20161029224631_add_privacy_to_groups.rb index 62fed976..7d938134 100644 --- a/db/migrate/20161029224631_add_privacy_to_groups.rb +++ b/db/migrate/20161029224631_add_privacy_to_groups.rb @@ -1,4 +1,4 @@ -class AddPrivacyToGroups < ActiveRecord::Migration +class AddPrivacyToGroups < ActiveRecord::Migration[4.2] def change add_column :groups, :privacy, :string end diff --git a/db/migrate/20161029224722_add_privacy_to_scenes.rb b/db/migrate/20161029224722_add_privacy_to_scenes.rb index 25ec1441..0074f491 100644 --- a/db/migrate/20161029224722_add_privacy_to_scenes.rb +++ b/db/migrate/20161029224722_add_privacy_to_scenes.rb @@ -1,4 +1,4 @@ -class AddPrivacyToScenes < ActiveRecord::Migration +class AddPrivacyToScenes < ActiveRecord::Migration[4.2] def change add_column :scenes, :privacy, :string end diff --git a/db/migrate/20161102095042_add_plan_type_to_users.rb b/db/migrate/20161102095042_add_plan_type_to_users.rb index 79328903..464d1d55 100644 --- a/db/migrate/20161102095042_add_plan_type_to_users.rb +++ b/db/migrate/20161102095042_add_plan_type_to_users.rb @@ -1,4 +1,4 @@ -class AddPlanTypeToUsers < ActiveRecord::Migration +class AddPlanTypeToUsers < ActiveRecord::Migration[4.2] def change add_column :users, :plan_type, :string end diff --git a/db/migrate/20161102182212_create_group_memberships.rb b/db/migrate/20161102182212_create_group_memberships.rb index d0ef2cd6..4388a9f0 100644 --- a/db/migrate/20161102182212_create_group_memberships.rb +++ b/db/migrate/20161102182212_create_group_memberships.rb @@ -1,4 +1,4 @@ -class CreateGroupMemberships < ActiveRecord::Migration +class CreateGroupMemberships < ActiveRecord::Migration[4.2] def change create_table :group_memberships do |t| t.integer :user_id diff --git a/db/migrate/20161102182259_create_group_locationship.rb b/db/migrate/20161102182259_create_group_locationship.rb index 40ef56b3..52dc1a0b 100644 --- a/db/migrate/20161102182259_create_group_locationship.rb +++ b/db/migrate/20161102182259_create_group_locationship.rb @@ -1,4 +1,4 @@ -class CreateGroupLocationship < ActiveRecord::Migration +class CreateGroupLocationship < ActiveRecord::Migration[4.2] def change create_table :group_locationships do |t| t.integer :user_id diff --git a/db/migrate/20170120213941_add_stripe_customer_id_to_user.rb b/db/migrate/20170120213941_add_stripe_customer_id_to_user.rb index 411770d1..bdd4430f 100644 --- a/db/migrate/20170120213941_add_stripe_customer_id_to_user.rb +++ b/db/migrate/20170120213941_add_stripe_customer_id_to_user.rb @@ -1,4 +1,4 @@ -class AddStripeCustomerIdToUser < ActiveRecord::Migration +class AddStripeCustomerIdToUser < ActiveRecord::Migration[4.2] def change add_column :users, :stripe_customer_id, :string end diff --git a/db/migrate/20170120214443_create_billing_plans.rb b/db/migrate/20170120214443_create_billing_plans.rb index f4bc149a..88713e23 100644 --- a/db/migrate/20170120214443_create_billing_plans.rb +++ b/db/migrate/20170120214443_create_billing_plans.rb @@ -1,4 +1,4 @@ -class CreateBillingPlans < ActiveRecord::Migration +class CreateBillingPlans < ActiveRecord::Migration[4.2] def change create_table :billing_plans do |t| t.string :name diff --git a/db/migrate/20170120214721_create_subscriptions.rb b/db/migrate/20170120214721_create_subscriptions.rb index 8037bfbf..513d5660 100644 --- a/db/migrate/20170120214721_create_subscriptions.rb +++ b/db/migrate/20170120214721_create_subscriptions.rb @@ -1,4 +1,4 @@ -class CreateSubscriptions < ActiveRecord::Migration +class CreateSubscriptions < ActiveRecord::Migration[4.2] def change create_table :subscriptions do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20170127164644_add_email_updates_to_user.rb b/db/migrate/20170127164644_add_email_updates_to_user.rb index 1e731ab0..c17e1d3b 100644 --- a/db/migrate/20170127164644_add_email_updates_to_user.rb +++ b/db/migrate/20170127164644_add_email_updates_to_user.rb @@ -1,4 +1,4 @@ -class AddEmailUpdatesToUser < ActiveRecord::Migration +class AddEmailUpdatesToUser < ActiveRecord::Migration[4.2] def change add_column :users, :email_updates, :boolean, default: true end diff --git a/db/migrate/20170201151923_add_selected_billing_plan_id_to_user.rb b/db/migrate/20170201151923_add_selected_billing_plan_id_to_user.rb index 53b2762f..c5aa4c24 100644 --- a/db/migrate/20170201151923_add_selected_billing_plan_id_to_user.rb +++ b/db/migrate/20170201151923_add_selected_billing_plan_id_to_user.rb @@ -1,4 +1,4 @@ -class AddSelectedBillingPlanIdToUser < ActiveRecord::Migration +class AddSelectedBillingPlanIdToUser < ActiveRecord::Migration[4.2] def change add_column :users, :selected_billing_plan_id, :integer end diff --git a/db/migrate/20170216211714_create_image_uploads.rb b/db/migrate/20170216211714_create_image_uploads.rb index 8978c76e..cda15b3a 100644 --- a/db/migrate/20170216211714_create_image_uploads.rb +++ b/db/migrate/20170216211714_create_image_uploads.rb @@ -1,4 +1,4 @@ -class CreateImageUploads < ActiveRecord::Migration +class CreateImageUploads < ActiveRecord::Migration[4.2] def change create_table :image_uploads do |t| t.string :privacy diff --git a/db/migrate/20170216211914_add_src_to_image_uploads.rb b/db/migrate/20170216211914_add_src_to_image_uploads.rb index 18048831..63502bf0 100644 --- a/db/migrate/20170216211914_add_src_to_image_uploads.rb +++ b/db/migrate/20170216211914_add_src_to_image_uploads.rb @@ -1,4 +1,4 @@ -class AddSrcToImageUploads < ActiveRecord::Migration +class AddSrcToImageUploads < ActiveRecord::Migration[4.2] def self.up add_attachment :image_uploads, :src end diff --git a/db/migrate/20170218010814_add_bandwidth_to_user.rb b/db/migrate/20170218010814_add_bandwidth_to_user.rb index 52c06b70..3c41188a 100644 --- a/db/migrate/20170218010814_add_bandwidth_to_user.rb +++ b/db/migrate/20170218010814_add_bandwidth_to_user.rb @@ -1,4 +1,4 @@ -class AddBandwidthToUser < ActiveRecord::Migration +class AddBandwidthToUser < ActiveRecord::Migration[4.2] def change add_column :users, :upload_bandwidth_kb, :integer, default: 50_000 # 50 MB end diff --git a/db/migrate/20170218022943_add_bonus_bandwidth_to_billing_plan.rb b/db/migrate/20170218022943_add_bonus_bandwidth_to_billing_plan.rb index e1d4f1e0..11c19fd0 100644 --- a/db/migrate/20170218022943_add_bonus_bandwidth_to_billing_plan.rb +++ b/db/migrate/20170218022943_add_bonus_bandwidth_to_billing_plan.rb @@ -1,4 +1,4 @@ -class AddBonusBandwidthToBillingPlan < ActiveRecord::Migration +class AddBonusBandwidthToBillingPlan < ActiveRecord::Migration[4.2] def change add_column :billing_plans, :bonus_bandwidth_kb, :integer, default: 0 end diff --git a/db/migrate/20170228160245_create_creature_relationships.rb b/db/migrate/20170228160245_create_creature_relationships.rb index d61474c9..c57905e1 100644 --- a/db/migrate/20170228160245_create_creature_relationships.rb +++ b/db/migrate/20170228160245_create_creature_relationships.rb @@ -1,4 +1,4 @@ -class CreateCreatureRelationships < ActiveRecord::Migration +class CreateCreatureRelationships < ActiveRecord::Migration[4.2] def change create_table :creature_relationships do |t| t.integer :user_id diff --git a/db/migrate/20170326164002_create_location_languageships.rb b/db/migrate/20170326164002_create_location_languageships.rb index 05682d47..92ff4b33 100644 --- a/db/migrate/20170326164002_create_location_languageships.rb +++ b/db/migrate/20170326164002_create_location_languageships.rb @@ -1,4 +1,4 @@ -class CreateLocationLanguageships < ActiveRecord::Migration +class CreateLocationLanguageships < ActiveRecord::Migration[4.2] def change create_table :location_languageships do |t| t.integer :user_id diff --git a/db/migrate/20170326170148_add_genre_to_universe.rb b/db/migrate/20170326170148_add_genre_to_universe.rb index 634dbc58..6211436d 100644 --- a/db/migrate/20170326170148_add_genre_to_universe.rb +++ b/db/migrate/20170326170148_add_genre_to_universe.rb @@ -1,4 +1,4 @@ -class AddGenreToUniverse < ActiveRecord::Migration +class AddGenreToUniverse < ActiveRecord::Migration[4.2] def change add_column :universes, :genre, :string end diff --git a/db/migrate/20170331001122_create_referral_codes.rb b/db/migrate/20170331001122_create_referral_codes.rb index 4293a0f2..ead106fd 100644 --- a/db/migrate/20170331001122_create_referral_codes.rb +++ b/db/migrate/20170331001122_create_referral_codes.rb @@ -1,4 +1,4 @@ -class CreateReferralCodes < ActiveRecord::Migration +class CreateReferralCodes < ActiveRecord::Migration[4.2] def change create_table :referral_codes do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20170403180417_create_referrals.rb b/db/migrate/20170403180417_create_referrals.rb index 0e12085d..689e428c 100644 --- a/db/migrate/20170403180417_create_referrals.rb +++ b/db/migrate/20170403180417_create_referrals.rb @@ -1,4 +1,4 @@ -class CreateReferrals < ActiveRecord::Migration +class CreateReferrals < ActiveRecord::Migration[4.2] def change create_table :referrals do |t| t.integer :referrer_id diff --git a/db/migrate/20170415183537_add_secure_code_to_users.rb b/db/migrate/20170415183537_add_secure_code_to_users.rb index 50752791..6b38aa37 100644 --- a/db/migrate/20170415183537_add_secure_code_to_users.rb +++ b/db/migrate/20170415183537_add_secure_code_to_users.rb @@ -1,4 +1,4 @@ -class AddSecureCodeToUsers < ActiveRecord::Migration +class AddSecureCodeToUsers < ActiveRecord::Migration[4.2] def change add_column :users, :secure_code, :string end diff --git a/db/migrate/20170415192410_create_votables.rb b/db/migrate/20170415192410_create_votables.rb index 9c160108..548c7a43 100644 --- a/db/migrate/20170415192410_create_votables.rb +++ b/db/migrate/20170415192410_create_votables.rb @@ -1,4 +1,4 @@ -class CreateVotables < ActiveRecord::Migration +class CreateVotables < ActiveRecord::Migration[4.2] def change create_table :votables do |t| t.string :name diff --git a/db/migrate/20170415192437_create_votes.rb b/db/migrate/20170415192437_create_votes.rb index 1960e385..40b5a0ce 100644 --- a/db/migrate/20170415192437_create_votes.rb +++ b/db/migrate/20170415192437_create_votes.rb @@ -1,4 +1,4 @@ -class CreateVotes < ActiveRecord::Migration +class CreateVotes < ActiveRecord::Migration[4.2] def change create_table :votes do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20170417190318_create_raffle_entries.rb b/db/migrate/20170417190318_create_raffle_entries.rb index ea2e2916..6efba083 100644 --- a/db/migrate/20170417190318_create_raffle_entries.rb +++ b/db/migrate/20170417190318_create_raffle_entries.rb @@ -1,4 +1,4 @@ -class CreateRaffleEntries < ActiveRecord::Migration +class CreateRaffleEntries < ActiveRecord::Migration[4.2] def change create_table :raffle_entries do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20170517152023_create_documents.rb b/db/migrate/20170517152023_create_documents.rb index ac6b1272..b384a398 100644 --- a/db/migrate/20170517152023_create_documents.rb +++ b/db/migrate/20170517152023_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.references :user, index: true, foreign_key: true diff --git a/db/migrate/20170517164648_add_fluid_preference_to_user.rb b/db/migrate/20170517164648_add_fluid_preference_to_user.rb index 6ac8bd82..f95f7054 100644 --- a/db/migrate/20170517164648_add_fluid_preference_to_user.rb +++ b/db/migrate/20170517164648_add_fluid_preference_to_user.rb @@ -1,4 +1,4 @@ -class AddFluidPreferenceToUser < ActiveRecord::Migration +class AddFluidPreferenceToUser < ActiveRecord::Migration[4.2] def change add_column :users, :fluid_preference, :boolean end diff --git a/db/migrate/20170712190101_create_content_change_events.rb b/db/migrate/20170712190101_create_content_change_events.rb index f4729472..c409cef6 100644 --- a/db/migrate/20170712190101_create_content_change_events.rb +++ b/db/migrate/20170712190101_create_content_change_events.rb @@ -1,4 +1,4 @@ -class CreateContentChangeEvents < ActiveRecord::Migration +class CreateContentChangeEvents < ActiveRecord::Migration[4.2] def change create_table :content_change_events do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20170724114620_add_username_to_user.rb b/db/migrate/20170724114620_add_username_to_user.rb index d1b7ea37..e712b909 100644 --- a/db/migrate/20170724114620_add_username_to_user.rb +++ b/db/migrate/20170724114620_add_username_to_user.rb @@ -1,4 +1,4 @@ -class AddUsernameToUser < ActiveRecord::Migration +class AddUsernameToUser < ActiveRecord::Migration[4.2] def change add_column :users, :username, :string add_index :users, :username, unique: true diff --git a/db/migrate/20170724114723_add_forum_admin_flag.rb b/db/migrate/20170724114723_add_forum_admin_flag.rb index a2e1f2ce..2cf5e441 100644 --- a/db/migrate/20170724114723_add_forum_admin_flag.rb +++ b/db/migrate/20170724114723_add_forum_admin_flag.rb @@ -1,4 +1,4 @@ -class AddForumAdminFlag < ActiveRecord::Migration +class AddForumAdminFlag < ActiveRecord::Migration[4.2] def change add_column :users, :forum_admin, :string, default: false end diff --git a/db/migrate/20170731000013_create_floras.rb b/db/migrate/20170731000013_create_floras.rb index 78e4716b..c7bbaefd 100644 --- a/db/migrate/20170731000013_create_floras.rb +++ b/db/migrate/20170731000013_create_floras.rb @@ -1,4 +1,4 @@ -class CreateFloras < ActiveRecord::Migration +class CreateFloras < ActiveRecord::Migration[4.2] def change create_table :floras do |t| t.string :name diff --git a/db/migrate/20170731000608_add_user_to_flora.rb b/db/migrate/20170731000608_add_user_to_flora.rb index ff424139..e553dad0 100644 --- a/db/migrate/20170731000608_add_user_to_flora.rb +++ b/db/migrate/20170731000608_add_user_to_flora.rb @@ -1,4 +1,4 @@ -class AddUserToFlora < ActiveRecord::Migration +class AddUserToFlora < ActiveRecord::Migration[4.2] def change add_reference :floras, :user, index: true, foreign_key: true end diff --git a/db/migrate/20170731001131_add_universe_to_flora.rb b/db/migrate/20170731001131_add_universe_to_flora.rb index 885d1b25..478556bc 100644 --- a/db/migrate/20170731001131_add_universe_to_flora.rb +++ b/db/migrate/20170731001131_add_universe_to_flora.rb @@ -1,4 +1,4 @@ -class AddUniverseToFlora < ActiveRecord::Migration +class AddUniverseToFlora < ActiveRecord::Migration[4.2] def change add_reference :floras, :universe, index: true, foreign_key: true end diff --git a/db/migrate/20170731001803_add_notes_to_flora.rb b/db/migrate/20170731001803_add_notes_to_flora.rb index 8bc7bcb2..3df4563d 100644 --- a/db/migrate/20170731001803_add_notes_to_flora.rb +++ b/db/migrate/20170731001803_add_notes_to_flora.rb @@ -1,4 +1,4 @@ -class AddNotesToFlora < ActiveRecord::Migration +class AddNotesToFlora < ActiveRecord::Migration[4.2] def change add_column :floras, :notes, :string add_column :floras, :private_notes, :string diff --git a/db/migrate/20170731004406_create_flora_magical_effects.rb b/db/migrate/20170731004406_create_flora_magical_effects.rb index d76b201e..1844d112 100644 --- a/db/migrate/20170731004406_create_flora_magical_effects.rb +++ b/db/migrate/20170731004406_create_flora_magical_effects.rb @@ -1,4 +1,4 @@ -class CreateFloraMagicalEffects < ActiveRecord::Migration +class CreateFloraMagicalEffects < ActiveRecord::Migration[4.2] def change create_table :flora_magical_effects do |t| t.integer :flora_id diff --git a/db/migrate/20170731004450_create_flora_locations.rb b/db/migrate/20170731004450_create_flora_locations.rb index d7f9d5ba..cf3380a0 100644 --- a/db/migrate/20170731004450_create_flora_locations.rb +++ b/db/migrate/20170731004450_create_flora_locations.rb @@ -1,4 +1,4 @@ -class CreateFloraLocations < ActiveRecord::Migration +class CreateFloraLocations < ActiveRecord::Migration[4.2] def change create_table :flora_locations do |t| t.integer :flora_id diff --git a/db/migrate/20170731004509_create_flora_eaten_bies.rb b/db/migrate/20170731004509_create_flora_eaten_bies.rb index c96a65fa..ef40588e 100644 --- a/db/migrate/20170731004509_create_flora_eaten_bies.rb +++ b/db/migrate/20170731004509_create_flora_eaten_bies.rb @@ -1,4 +1,4 @@ -class CreateFloraEatenBies < ActiveRecord::Migration +class CreateFloraEatenBies < ActiveRecord::Migration[4.2] def change create_table :flora_eaten_bies do |t| t.integer :flora_id diff --git a/db/migrate/20170731004712_create_flora_relationships.rb b/db/migrate/20170731004712_create_flora_relationships.rb index 055b6755..92e9a6fd 100644 --- a/db/migrate/20170731004712_create_flora_relationships.rb +++ b/db/migrate/20170731004712_create_flora_relationships.rb @@ -1,4 +1,4 @@ -class CreateFloraRelationships < ActiveRecord::Migration +class CreateFloraRelationships < ActiveRecord::Migration[4.2] def change create_table :flora_relationships do |t| t.integer :flora_id diff --git a/db/migrate/20170731010449_add_privacy_to_flora.rb b/db/migrate/20170731010449_add_privacy_to_flora.rb index e9569610..813329cf 100644 --- a/db/migrate/20170731010449_add_privacy_to_flora.rb +++ b/db/migrate/20170731010449_add_privacy_to_flora.rb @@ -1,4 +1,4 @@ -class AddPrivacyToFlora < ActiveRecord::Migration +class AddPrivacyToFlora < ActiveRecord::Migration[4.2] def change add_column :floras, :privacy, :string end diff --git a/db/migrate/20170811145534_create_contributors.rb b/db/migrate/20170811145534_create_contributors.rb index d7c3ee64..48f9ee80 100644 --- a/db/migrate/20170811145534_create_contributors.rb +++ b/db/migrate/20170811145534_create_contributors.rb @@ -1,4 +1,4 @@ -class CreateContributors < ActiveRecord::Migration +class CreateContributors < ActiveRecord::Migration[4.2] def change create_table :contributors do |t| t.references :universe, index: true, foreign_key: true diff --git a/db/migrate/20171028220829_add_forum_admin_flag_again.rb b/db/migrate/20171028220829_add_forum_admin_flag_again.rb index c5e3f757..18c2ec2f 100644 --- a/db/migrate/20171028220829_add_forum_admin_flag_again.rb +++ b/db/migrate/20171028220829_add_forum_admin_flag_again.rb @@ -1,4 +1,4 @@ -class AddForumAdminFlagAgain < ActiveRecord::Migration +class AddForumAdminFlagAgain < ActiveRecord::Migration[4.2] def change add_column :users, :forum_administrator, :boolean, null: false, default: false end diff --git a/db/migrate/20171028221518_remove_forum_admin_flag.rb b/db/migrate/20171028221518_remove_forum_admin_flag.rb index 257d364a..8ff37a14 100644 --- a/db/migrate/20171028221518_remove_forum_admin_flag.rb +++ b/db/migrate/20171028221518_remove_forum_admin_flag.rb @@ -1,4 +1,4 @@ -class RemoveForumAdminFlag < ActiveRecord::Migration +class RemoveForumAdminFlag < ActiveRecord::Migration[4.2] def change remove_column :users, :forum_admin end diff --git a/db/migrate/20171028230258_create_delayed_jobs.rb b/db/migrate/20171028230258_create_delayed_jobs.rb index 27fdcf6c..f90bc1bc 100644 --- a/db/migrate/20171028230258_create_delayed_jobs.rb +++ b/db/migrate/20171028230258_create_delayed_jobs.rb @@ -1,4 +1,4 @@ -class CreateDelayedJobs < ActiveRecord::Migration +class CreateDelayedJobs < ActiveRecord::Migration[4.2] def self.up create_table :delayed_jobs, force: true do |table| table.integer :priority, default: 0, null: false # Allows some jobs to jump to the front of the queue diff --git a/db/migrate/20171226195348_add_deleted_at_to_items.rb b/db/migrate/20171226195348_add_deleted_at_to_items.rb index 130e1dc0..d7d8c2e3 100644 --- a/db/migrate/20171226195348_add_deleted_at_to_items.rb +++ b/db/migrate/20171226195348_add_deleted_at_to_items.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToItems < ActiveRecord::Migration +class AddDeletedAtToItems < ActiveRecord::Migration[4.2] def change add_column :items, :deleted_at, :datetime add_index :items, :deleted_at diff --git a/db/migrate/20171226202223_add_deleted_at_to_users.rb b/db/migrate/20171226202223_add_deleted_at_to_users.rb index 29ba1647..669ac0f6 100644 --- a/db/migrate/20171226202223_add_deleted_at_to_users.rb +++ b/db/migrate/20171226202223_add_deleted_at_to_users.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToUsers < ActiveRecord::Migration +class AddDeletedAtToUsers < ActiveRecord::Migration[4.2] def change add_column :users, :deleted_at, :datetime add_index :users, :deleted_at diff --git a/db/migrate/20171226202321_add_deleted_at_to_characters.rb b/db/migrate/20171226202321_add_deleted_at_to_characters.rb index 11ef1ed1..be0140e5 100644 --- a/db/migrate/20171226202321_add_deleted_at_to_characters.rb +++ b/db/migrate/20171226202321_add_deleted_at_to_characters.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToCharacters < ActiveRecord::Migration +class AddDeletedAtToCharacters < ActiveRecord::Migration[4.2] def change add_column :characters, :deleted_at, :datetime add_index :characters, :deleted_at diff --git a/db/migrate/20171226202730_add_deleted_at_to_creatures.rb b/db/migrate/20171226202730_add_deleted_at_to_creatures.rb index ee60180a..901ceed7 100644 --- a/db/migrate/20171226202730_add_deleted_at_to_creatures.rb +++ b/db/migrate/20171226202730_add_deleted_at_to_creatures.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToCreatures < ActiveRecord::Migration +class AddDeletedAtToCreatures < ActiveRecord::Migration[4.2] def change add_column :creatures, :deleted_at, :datetime add_index :creatures, :deleted_at diff --git a/db/migrate/20171226202745_add_deleted_at_to_floras.rb b/db/migrate/20171226202745_add_deleted_at_to_floras.rb index bec2efb7..ca236772 100644 --- a/db/migrate/20171226202745_add_deleted_at_to_floras.rb +++ b/db/migrate/20171226202745_add_deleted_at_to_floras.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToFloras < ActiveRecord::Migration +class AddDeletedAtToFloras < ActiveRecord::Migration[4.2] def change add_column :floras, :deleted_at, :datetime add_index :floras, :deleted_at diff --git a/db/migrate/20171226202810_add_deleted_at_to_groups.rb b/db/migrate/20171226202810_add_deleted_at_to_groups.rb index 7d26fd59..7cca729b 100644 --- a/db/migrate/20171226202810_add_deleted_at_to_groups.rb +++ b/db/migrate/20171226202810_add_deleted_at_to_groups.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToGroups < ActiveRecord::Migration +class AddDeletedAtToGroups < ActiveRecord::Migration[4.2] def change add_column :groups, :deleted_at, :datetime add_index :groups, :deleted_at diff --git a/db/migrate/20171226203002_add_deleted_at_to_languages.rb b/db/migrate/20171226203002_add_deleted_at_to_languages.rb index 39e380ed..707a65c8 100644 --- a/db/migrate/20171226203002_add_deleted_at_to_languages.rb +++ b/db/migrate/20171226203002_add_deleted_at_to_languages.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToLanguages < ActiveRecord::Migration +class AddDeletedAtToLanguages < ActiveRecord::Migration[4.2] def change add_column :languages, :deleted_at, :datetime add_index :languages, :deleted_at diff --git a/db/migrate/20171226203016_add_deleted_at_to_locations.rb b/db/migrate/20171226203016_add_deleted_at_to_locations.rb index 5a237b67..81e22178 100644 --- a/db/migrate/20171226203016_add_deleted_at_to_locations.rb +++ b/db/migrate/20171226203016_add_deleted_at_to_locations.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToLocations < ActiveRecord::Migration +class AddDeletedAtToLocations < ActiveRecord::Migration[4.2] def change add_column :locations, :deleted_at, :datetime add_index :locations, :deleted_at diff --git a/db/migrate/20171226203030_add_deleted_at_to_magics.rb b/db/migrate/20171226203030_add_deleted_at_to_magics.rb index 92df98fa..a153a14d 100644 --- a/db/migrate/20171226203030_add_deleted_at_to_magics.rb +++ b/db/migrate/20171226203030_add_deleted_at_to_magics.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToMagics < ActiveRecord::Migration +class AddDeletedAtToMagics < ActiveRecord::Migration[4.2] def change add_column :magics, :deleted_at, :datetime add_index :magics, :deleted_at diff --git a/db/migrate/20171226203042_add_deleted_at_to_races.rb b/db/migrate/20171226203042_add_deleted_at_to_races.rb index 5311d15a..68daa0e7 100644 --- a/db/migrate/20171226203042_add_deleted_at_to_races.rb +++ b/db/migrate/20171226203042_add_deleted_at_to_races.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToRaces < ActiveRecord::Migration +class AddDeletedAtToRaces < ActiveRecord::Migration[4.2] def change add_column :races, :deleted_at, :datetime add_index :races, :deleted_at diff --git a/db/migrate/20171226203059_add_deleted_at_to_religions.rb b/db/migrate/20171226203059_add_deleted_at_to_religions.rb index 572d08ca..a5eae671 100644 --- a/db/migrate/20171226203059_add_deleted_at_to_religions.rb +++ b/db/migrate/20171226203059_add_deleted_at_to_religions.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToReligions < ActiveRecord::Migration +class AddDeletedAtToReligions < ActiveRecord::Migration[4.2] def change add_column :religions, :deleted_at, :datetime add_index :religions, :deleted_at diff --git a/db/migrate/20171226203117_add_deleted_at_to_scenes.rb b/db/migrate/20171226203117_add_deleted_at_to_scenes.rb index 4c60be95..1b87b90d 100644 --- a/db/migrate/20171226203117_add_deleted_at_to_scenes.rb +++ b/db/migrate/20171226203117_add_deleted_at_to_scenes.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToScenes < ActiveRecord::Migration +class AddDeletedAtToScenes < ActiveRecord::Migration[4.2] def change add_column :scenes, :deleted_at, :datetime add_index :scenes, :deleted_at diff --git a/db/migrate/20171226203129_add_deleted_at_to_universes.rb b/db/migrate/20171226203129_add_deleted_at_to_universes.rb index c1edfbd3..8e18b177 100644 --- a/db/migrate/20171226203129_add_deleted_at_to_universes.rb +++ b/db/migrate/20171226203129_add_deleted_at_to_universes.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToUniverses < ActiveRecord::Migration +class AddDeletedAtToUniverses < ActiveRecord::Migration[4.2] def change add_column :universes, :deleted_at, :datetime add_index :universes, :deleted_at diff --git a/db/migrate/20171226213749_create_character_love_interests.rb b/db/migrate/20171226213749_create_character_love_interests.rb index 3f1f8d7a..92d500e6 100644 --- a/db/migrate/20171226213749_create_character_love_interests.rb +++ b/db/migrate/20171226213749_create_character_love_interests.rb @@ -1,4 +1,4 @@ -class CreateCharacterLoveInterests < ActiveRecord::Migration +class CreateCharacterLoveInterests < ActiveRecord::Migration[4.2] def change create_table :character_love_interests do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171227180909_create_user_content_type_activators.rb b/db/migrate/20171227180909_create_user_content_type_activators.rb index 397db7ca..6cd7f1ed 100644 --- a/db/migrate/20171227180909_create_user_content_type_activators.rb +++ b/db/migrate/20171227180909_create_user_content_type_activators.rb @@ -1,4 +1,4 @@ -class CreateUserContentTypeActivators < ActiveRecord::Migration +class CreateUserContentTypeActivators < ActiveRecord::Migration[4.2] def change create_table :user_content_type_activators do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231172750_create_countries.rb b/db/migrate/20171231172750_create_countries.rb index 05425aef..266be02b 100644 --- a/db/migrate/20171231172750_create_countries.rb +++ b/db/migrate/20171231172750_create_countries.rb @@ -1,4 +1,4 @@ -class CreateCountries < ActiveRecord::Migration +class CreateCountries < ActiveRecord::Migration[4.2] def change create_table :countries do |t| t.string :name diff --git a/db/migrate/20171231174144_create_towns.rb b/db/migrate/20171231174144_create_towns.rb index 2235464d..8c6776b4 100644 --- a/db/migrate/20171231174144_create_towns.rb +++ b/db/migrate/20171231174144_create_towns.rb @@ -1,4 +1,4 @@ -class CreateTowns < ActiveRecord::Migration +class CreateTowns < ActiveRecord::Migration[4.2] def change create_table :towns do |t| t.string :name diff --git a/db/migrate/20171231174241_create_landmarks.rb b/db/migrate/20171231174241_create_landmarks.rb index 391c588d..d5a1a525 100644 --- a/db/migrate/20171231174241_create_landmarks.rb +++ b/db/migrate/20171231174241_create_landmarks.rb @@ -1,4 +1,4 @@ -class CreateLandmarks < ActiveRecord::Migration +class CreateLandmarks < ActiveRecord::Migration[4.2] def change create_table :landmarks do |t| t.string :name diff --git a/db/migrate/20171231175209_add_deleted_at_to_countries.rb b/db/migrate/20171231175209_add_deleted_at_to_countries.rb index 9fdc9e8a..daa5a29b 100644 --- a/db/migrate/20171231175209_add_deleted_at_to_countries.rb +++ b/db/migrate/20171231175209_add_deleted_at_to_countries.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToCountries < ActiveRecord::Migration +class AddDeletedAtToCountries < ActiveRecord::Migration[4.2] def change add_column :countries, :deleted_at, :datetime end diff --git a/db/migrate/20171231175633_add_fields_to_town.rb b/db/migrate/20171231175633_add_fields_to_town.rb index c989051e..56e37250 100644 --- a/db/migrate/20171231175633_add_fields_to_town.rb +++ b/db/migrate/20171231175633_add_fields_to_town.rb @@ -1,4 +1,4 @@ -class AddFieldsToTown < ActiveRecord::Migration +class AddFieldsToTown < ActiveRecord::Migration[4.2] def change add_reference :towns, :universe, index: true, foreign_key: true add_column :towns, :deleted_at, :datetime diff --git a/db/migrate/20171231175706_add_deleted_at_to_landmark.rb b/db/migrate/20171231175706_add_deleted_at_to_landmark.rb index 5617a197..b114d8ed 100644 --- a/db/migrate/20171231175706_add_deleted_at_to_landmark.rb +++ b/db/migrate/20171231175706_add_deleted_at_to_landmark.rb @@ -1,4 +1,4 @@ -class AddDeletedAtToLandmark < ActiveRecord::Migration +class AddDeletedAtToLandmark < ActiveRecord::Migration[4.2] def change add_column :landmarks, :deleted_at, :datetime end diff --git a/db/migrate/20171231191101_add_privacy_to_towns.rb b/db/migrate/20171231191101_add_privacy_to_towns.rb index 00556129..16d4af3b 100644 --- a/db/migrate/20171231191101_add_privacy_to_towns.rb +++ b/db/migrate/20171231191101_add_privacy_to_towns.rb @@ -1,4 +1,4 @@ -class AddPrivacyToTowns < ActiveRecord::Migration +class AddPrivacyToTowns < ActiveRecord::Migration[4.2] def change add_column :towns, :privacy, :string end diff --git a/db/migrate/20171231191117_add_privacy_to_countries.rb b/db/migrate/20171231191117_add_privacy_to_countries.rb index 90a9df3a..1d1a266b 100644 --- a/db/migrate/20171231191117_add_privacy_to_countries.rb +++ b/db/migrate/20171231191117_add_privacy_to_countries.rb @@ -1,4 +1,4 @@ -class AddPrivacyToCountries < ActiveRecord::Migration +class AddPrivacyToCountries < ActiveRecord::Migration[4.2] def change add_column :countries, :privacy, :string end diff --git a/db/migrate/20171231191133_add_privacy_to_landmarks.rb b/db/migrate/20171231191133_add_privacy_to_landmarks.rb index 00dfe3b9..a22145d0 100644 --- a/db/migrate/20171231191133_add_privacy_to_landmarks.rb +++ b/db/migrate/20171231191133_add_privacy_to_landmarks.rb @@ -1,4 +1,4 @@ -class AddPrivacyToLandmarks < ActiveRecord::Migration +class AddPrivacyToLandmarks < ActiveRecord::Migration[4.2] def change add_column :landmarks, :privacy, :string end diff --git a/db/migrate/20171231201746_add_user_to_towns.rb b/db/migrate/20171231201746_add_user_to_towns.rb index 71b76cb8..0db6bae8 100644 --- a/db/migrate/20171231201746_add_user_to_towns.rb +++ b/db/migrate/20171231201746_add_user_to_towns.rb @@ -1,4 +1,4 @@ -class AddUserToTowns < ActiveRecord::Migration +class AddUserToTowns < ActiveRecord::Migration[4.2] def change add_reference :towns, :user, index: true, foreign_key: true end diff --git a/db/migrate/20171231201817_add_user_to_countries.rb b/db/migrate/20171231201817_add_user_to_countries.rb index 9faa6236..88fa1c38 100644 --- a/db/migrate/20171231201817_add_user_to_countries.rb +++ b/db/migrate/20171231201817_add_user_to_countries.rb @@ -1,4 +1,4 @@ -class AddUserToCountries < ActiveRecord::Migration +class AddUserToCountries < ActiveRecord::Migration[4.2] def change add_reference :countries, :user, index: true, foreign_key: true end diff --git a/db/migrate/20171231201900_add_user_to_landmarks.rb b/db/migrate/20171231201900_add_user_to_landmarks.rb index 208db8c0..2c5c69fc 100644 --- a/db/migrate/20171231201900_add_user_to_landmarks.rb +++ b/db/migrate/20171231201900_add_user_to_landmarks.rb @@ -1,4 +1,4 @@ -class AddUserToLandmarks < ActiveRecord::Migration +class AddUserToLandmarks < ActiveRecord::Migration[4.2] def change add_reference :landmarks, :user, index: true, foreign_key: true end diff --git a/db/migrate/20171231230411_create_country_towns.rb b/db/migrate/20171231230411_create_country_towns.rb index a44164d8..87d4540e 100644 --- a/db/migrate/20171231230411_create_country_towns.rb +++ b/db/migrate/20171231230411_create_country_towns.rb @@ -1,4 +1,4 @@ -class CreateCountryTowns < ActiveRecord::Migration +class CreateCountryTowns < ActiveRecord::Migration[4.2] def change create_table :country_towns do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230524_create_country_locations.rb b/db/migrate/20171231230524_create_country_locations.rb index 90cd82ca..5ea1005d 100644 --- a/db/migrate/20171231230524_create_country_locations.rb +++ b/db/migrate/20171231230524_create_country_locations.rb @@ -1,4 +1,4 @@ -class CreateCountryLocations < ActiveRecord::Migration +class CreateCountryLocations < ActiveRecord::Migration[4.2] def change create_table :country_locations do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230530_create_country_languages.rb b/db/migrate/20171231230530_create_country_languages.rb index 8a0c6130..45d65124 100644 --- a/db/migrate/20171231230530_create_country_languages.rb +++ b/db/migrate/20171231230530_create_country_languages.rb @@ -1,4 +1,4 @@ -class CreateCountryLanguages < ActiveRecord::Migration +class CreateCountryLanguages < ActiveRecord::Migration[4.2] def change create_table :country_languages do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230535_create_country_religions.rb b/db/migrate/20171231230535_create_country_religions.rb index f4961cfc..0697322e 100644 --- a/db/migrate/20171231230535_create_country_religions.rb +++ b/db/migrate/20171231230535_create_country_religions.rb @@ -1,4 +1,4 @@ -class CreateCountryReligions < ActiveRecord::Migration +class CreateCountryReligions < ActiveRecord::Migration[4.2] def change create_table :country_religions do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230540_create_country_landmarks.rb b/db/migrate/20171231230540_create_country_landmarks.rb index f3b7b396..d3f43cb9 100644 --- a/db/migrate/20171231230540_create_country_landmarks.rb +++ b/db/migrate/20171231230540_create_country_landmarks.rb @@ -1,4 +1,4 @@ -class CreateCountryLandmarks < ActiveRecord::Migration +class CreateCountryLandmarks < ActiveRecord::Migration[4.2] def change create_table :country_landmarks do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230546_create_country_creatures.rb b/db/migrate/20171231230546_create_country_creatures.rb index c3ce8aad..1bec9c88 100644 --- a/db/migrate/20171231230546_create_country_creatures.rb +++ b/db/migrate/20171231230546_create_country_creatures.rb @@ -1,4 +1,4 @@ -class CreateCountryCreatures < ActiveRecord::Migration +class CreateCountryCreatures < ActiveRecord::Migration[4.2] def change create_table :country_creatures do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230551_create_country_floras.rb b/db/migrate/20171231230551_create_country_floras.rb index b3884923..1724435f 100644 --- a/db/migrate/20171231230551_create_country_floras.rb +++ b/db/migrate/20171231230551_create_country_floras.rb @@ -1,4 +1,4 @@ -class CreateCountryFloras < ActiveRecord::Migration +class CreateCountryFloras < ActiveRecord::Migration[4.2] def change create_table :country_floras do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230645_create_town_citizens.rb b/db/migrate/20171231230645_create_town_citizens.rb index 30d2dafd..13a9c0d6 100644 --- a/db/migrate/20171231230645_create_town_citizens.rb +++ b/db/migrate/20171231230645_create_town_citizens.rb @@ -1,4 +1,4 @@ -class CreateTownCitizens < ActiveRecord::Migration +class CreateTownCitizens < ActiveRecord::Migration[4.2] def change create_table :town_citizens do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230650_create_town_floras.rb b/db/migrate/20171231230650_create_town_floras.rb index 5dca1706..13aee270 100644 --- a/db/migrate/20171231230650_create_town_floras.rb +++ b/db/migrate/20171231230650_create_town_floras.rb @@ -1,4 +1,4 @@ -class CreateTownFloras < ActiveRecord::Migration +class CreateTownFloras < ActiveRecord::Migration[4.2] def change create_table :town_floras do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230656_create_town_creatures.rb b/db/migrate/20171231230656_create_town_creatures.rb index 8c9b445d..14dfa348 100644 --- a/db/migrate/20171231230656_create_town_creatures.rb +++ b/db/migrate/20171231230656_create_town_creatures.rb @@ -1,4 +1,4 @@ -class CreateTownCreatures < ActiveRecord::Migration +class CreateTownCreatures < ActiveRecord::Migration[4.2] def change create_table :town_creatures do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230701_create_town_groups.rb b/db/migrate/20171231230701_create_town_groups.rb index fa255405..f85adf8a 100644 --- a/db/migrate/20171231230701_create_town_groups.rb +++ b/db/migrate/20171231230701_create_town_groups.rb @@ -1,4 +1,4 @@ -class CreateTownGroups < ActiveRecord::Migration +class CreateTownGroups < ActiveRecord::Migration[4.2] def change create_table :town_groups do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230707_create_town_languages.rb b/db/migrate/20171231230707_create_town_languages.rb index 49e8ed34..23729b8c 100644 --- a/db/migrate/20171231230707_create_town_languages.rb +++ b/db/migrate/20171231230707_create_town_languages.rb @@ -1,4 +1,4 @@ -class CreateTownLanguages < ActiveRecord::Migration +class CreateTownLanguages < ActiveRecord::Migration[4.2] def change create_table :town_languages do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230712_create_town_countries.rb b/db/migrate/20171231230712_create_town_countries.rb index d2a92c5e..1b13a125 100644 --- a/db/migrate/20171231230712_create_town_countries.rb +++ b/db/migrate/20171231230712_create_town_countries.rb @@ -1,4 +1,4 @@ -class CreateTownCountries < ActiveRecord::Migration +class CreateTownCountries < ActiveRecord::Migration[4.2] def change create_table :town_countries do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230717_create_town_nearby_landmarks.rb b/db/migrate/20171231230717_create_town_nearby_landmarks.rb index ecf2c318..af8cfceb 100644 --- a/db/migrate/20171231230717_create_town_nearby_landmarks.rb +++ b/db/migrate/20171231230717_create_town_nearby_landmarks.rb @@ -1,4 +1,4 @@ -class CreateTownNearbyLandmarks < ActiveRecord::Migration +class CreateTownNearbyLandmarks < ActiveRecord::Migration[4.2] def change create_table :town_nearby_landmarks do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230751_create_landmark_nearby_towns.rb b/db/migrate/20171231230751_create_landmark_nearby_towns.rb index 9eaef5b0..bfafa8e1 100644 --- a/db/migrate/20171231230751_create_landmark_nearby_towns.rb +++ b/db/migrate/20171231230751_create_landmark_nearby_towns.rb @@ -1,4 +1,4 @@ -class CreateLandmarkNearbyTowns < ActiveRecord::Migration +class CreateLandmarkNearbyTowns < ActiveRecord::Migration[4.2] def change create_table :landmark_nearby_towns do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230757_create_landmark_countries.rb b/db/migrate/20171231230757_create_landmark_countries.rb index e53303ec..19b57fa9 100644 --- a/db/migrate/20171231230757_create_landmark_countries.rb +++ b/db/migrate/20171231230757_create_landmark_countries.rb @@ -1,4 +1,4 @@ -class CreateLandmarkCountries < ActiveRecord::Migration +class CreateLandmarkCountries < ActiveRecord::Migration[4.2] def change create_table :landmark_countries do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231230802_create_landmark_floras.rb b/db/migrate/20171231230802_create_landmark_floras.rb index 4b00c8f6..74d848c7 100644 --- a/db/migrate/20171231230802_create_landmark_floras.rb +++ b/db/migrate/20171231230802_create_landmark_floras.rb @@ -1,4 +1,4 @@ -class CreateLandmarkFloras < ActiveRecord::Migration +class CreateLandmarkFloras < ActiveRecord::Migration[4.2] def change create_table :landmark_floras do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20171231235747_create_landmark_creatures.rb b/db/migrate/20171231235747_create_landmark_creatures.rb index d896c4c9..bec54032 100644 --- a/db/migrate/20171231235747_create_landmark_creatures.rb +++ b/db/migrate/20171231235747_create_landmark_creatures.rb @@ -1,4 +1,4 @@ -class CreateLandmarkCreatures < ActiveRecord::Migration +class CreateLandmarkCreatures < ActiveRecord::Migration[4.2] def change create_table :landmark_creatures do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180107183433_create_stripe_event_logs.rb b/db/migrate/20180107183433_create_stripe_event_logs.rb index 6ba91d28..2a2b034f 100644 --- a/db/migrate/20180107183433_create_stripe_event_logs.rb +++ b/db/migrate/20180107183433_create_stripe_event_logs.rb @@ -1,4 +1,4 @@ -class CreateStripeEventLogs < ActiveRecord::Migration +class CreateStripeEventLogs < ActiveRecord::Migration[4.2] def change create_table :stripe_event_logs do |t| t.string :event_id diff --git a/db/migrate/20180112043008_add_site_administrator_flag_to_users.rb b/db/migrate/20180112043008_add_site_administrator_flag_to_users.rb index 0218b8b9..e5f7da7c 100644 --- a/db/migrate/20180112043008_add_site_administrator_flag_to_users.rb +++ b/db/migrate/20180112043008_add_site_administrator_flag_to_users.rb @@ -1,4 +1,4 @@ -class AddSiteAdministratorFlagToUsers < ActiveRecord::Migration +class AddSiteAdministratorFlagToUsers < ActiveRecord::Migration[4.2] def change add_column :users, :site_administrator, :boolean, default: false end diff --git a/db/migrate/20180120010225_add_universe_id_index_to_characters.rb b/db/migrate/20180120010225_add_universe_id_index_to_characters.rb index ae3343fd..236bc48a 100644 --- a/db/migrate/20180120010225_add_universe_id_index_to_characters.rb +++ b/db/migrate/20180120010225_add_universe_id_index_to_characters.rb @@ -1,4 +1,4 @@ -class AddUniverseIdIndexToCharacters < ActiveRecord::Migration +class AddUniverseIdIndexToCharacters < ActiveRecord::Migration[4.2] def change add_index :characters, :universe_id end diff --git a/db/migrate/20180120031750_add_indexes_to_content_change_event.rb b/db/migrate/20180120031750_add_indexes_to_content_change_event.rb index ed691480..c9d41a82 100644 --- a/db/migrate/20180120031750_add_indexes_to_content_change_event.rb +++ b/db/migrate/20180120031750_add_indexes_to_content_change_event.rb @@ -1,4 +1,4 @@ -class AddIndexesToContentChangeEvent < ActiveRecord::Migration +class AddIndexesToContentChangeEvent < ActiveRecord::Migration[4.2] def change add_index :content_change_events, [:content_id, :content_type] end diff --git a/db/migrate/20180120032146_add_more_indices.rb b/db/migrate/20180120032146_add_more_indices.rb index e0ab0058..648204d0 100644 --- a/db/migrate/20180120032146_add_more_indices.rb +++ b/db/migrate/20180120032146_add_more_indices.rb @@ -1,4 +1,4 @@ -class AddMoreIndices < ActiveRecord::Migration +class AddMoreIndices < ActiveRecord::Migration[4.2] def change add_index :characters, :user_id add_index :universes, :user_id diff --git a/db/migrate/20180120033402_add_universe_indices.rb b/db/migrate/20180120033402_add_universe_indices.rb index dfbfc63f..b0772803 100644 --- a/db/migrate/20180120033402_add_universe_indices.rb +++ b/db/migrate/20180120033402_add_universe_indices.rb @@ -1,4 +1,4 @@ -class AddUniverseIndices < ActiveRecord::Migration +class AddUniverseIndices < ActiveRecord::Migration[4.2] def change add_index :magics, :universe_id add_index :scenes, :universe_id diff --git a/db/migrate/20180127055730_create_planets.rb b/db/migrate/20180127055730_create_planets.rb index 7c5e069f..6b6505d5 100644 --- a/db/migrate/20180127055730_create_planets.rb +++ b/db/migrate/20180127055730_create_planets.rb @@ -1,4 +1,4 @@ -class CreatePlanets < ActiveRecord::Migration +class CreatePlanets < ActiveRecord::Migration[4.2] def change create_table :planets do |t| t.string :name diff --git a/db/migrate/20180127200709_create_technologies.rb b/db/migrate/20180127200709_create_technologies.rb index b1594cf8..ec9e1766 100644 --- a/db/migrate/20180127200709_create_technologies.rb +++ b/db/migrate/20180127200709_create_technologies.rb @@ -1,4 +1,4 @@ -class CreateTechnologies < ActiveRecord::Migration +class CreateTechnologies < ActiveRecord::Migration[4.2] def change create_table :technologies do |t| t.string :name diff --git a/db/migrate/20180127200846_change_notes_column_on_planets.rb b/db/migrate/20180127200846_change_notes_column_on_planets.rb index f7a79427..2592f80e 100644 --- a/db/migrate/20180127200846_change_notes_column_on_planets.rb +++ b/db/migrate/20180127200846_change_notes_column_on_planets.rb @@ -1,4 +1,4 @@ -class ChangeNotesColumnOnPlanets < ActiveRecord::Migration +class ChangeNotesColumnOnPlanets < ActiveRecord::Migration[4.2] def change remove_column :planets, :public_notes add_column :planets, :notes, :string diff --git a/db/migrate/20180127202120_create_deities.rb b/db/migrate/20180127202120_create_deities.rb index 24a4bfe4..1ec93f15 100644 --- a/db/migrate/20180127202120_create_deities.rb +++ b/db/migrate/20180127202120_create_deities.rb @@ -1,4 +1,4 @@ -class CreateDeities < ActiveRecord::Migration +class CreateDeities < ActiveRecord::Migration[4.2] def change create_table :deities do |t| t.string :name diff --git a/db/migrate/20180127203130_create_governments.rb b/db/migrate/20180127203130_create_governments.rb index 9075370f..ef569c4d 100644 --- a/db/migrate/20180127203130_create_governments.rb +++ b/db/migrate/20180127203130_create_governments.rb @@ -1,4 +1,4 @@ -class CreateGovernments < ActiveRecord::Migration +class CreateGovernments < ActiveRecord::Migration[4.2] def change create_table :governments do |t| t.string :name diff --git a/db/migrate/20180129033131_rename_universe_technologies_to_technology.rb b/db/migrate/20180129033131_rename_universe_technologies_to_technology.rb index 07d77f33..ab82463a 100644 --- a/db/migrate/20180129033131_rename_universe_technologies_to_technology.rb +++ b/db/migrate/20180129033131_rename_universe_technologies_to_technology.rb @@ -1,4 +1,4 @@ -class RenameUniverseTechnologiesToTechnology < ActiveRecord::Migration +class RenameUniverseTechnologiesToTechnology < ActiveRecord::Migration[4.2] def change rename_column :universes, :technologies, :technology if column_exists?(:universes, :technologies) && !column_exists?(:universes, :technology) end diff --git a/db/migrate/20180130231607_remove_landmarks_from_planets.rb b/db/migrate/20180130231607_remove_landmarks_from_planets.rb index 7025bff9..4552d7b6 100644 --- a/db/migrate/20180130231607_remove_landmarks_from_planets.rb +++ b/db/migrate/20180130231607_remove_landmarks_from_planets.rb @@ -1,4 +1,4 @@ -class RemoveLandmarksFromPlanets < ActiveRecord::Migration +class RemoveLandmarksFromPlanets < ActiveRecord::Migration[4.2] def change remove_column :planets, :landmarks end diff --git a/db/migrate/20180130233224_create_planet_countries.rb b/db/migrate/20180130233224_create_planet_countries.rb index 6d057faf..b5259b7a 100644 --- a/db/migrate/20180130233224_create_planet_countries.rb +++ b/db/migrate/20180130233224_create_planet_countries.rb @@ -1,4 +1,4 @@ -class CreatePlanetCountries < ActiveRecord::Migration +class CreatePlanetCountries < ActiveRecord::Migration[4.2] def change create_table :planet_countries do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233229_create_planet_locations.rb b/db/migrate/20180130233229_create_planet_locations.rb index 64dc31c6..cabb1567 100644 --- a/db/migrate/20180130233229_create_planet_locations.rb +++ b/db/migrate/20180130233229_create_planet_locations.rb @@ -1,4 +1,4 @@ -class CreatePlanetLocations < ActiveRecord::Migration +class CreatePlanetLocations < ActiveRecord::Migration[4.2] def change create_table :planet_locations do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233235_create_planet_landmarks.rb b/db/migrate/20180130233235_create_planet_landmarks.rb index 6c4e90c2..69142e5f 100644 --- a/db/migrate/20180130233235_create_planet_landmarks.rb +++ b/db/migrate/20180130233235_create_planet_landmarks.rb @@ -1,4 +1,4 @@ -class CreatePlanetLandmarks < ActiveRecord::Migration +class CreatePlanetLandmarks < ActiveRecord::Migration[4.2] def change create_table :planet_landmarks do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233240_create_planet_races.rb b/db/migrate/20180130233240_create_planet_races.rb index 37800c13..fe1eb9f0 100644 --- a/db/migrate/20180130233240_create_planet_races.rb +++ b/db/migrate/20180130233240_create_planet_races.rb @@ -1,4 +1,4 @@ -class CreatePlanetRaces < ActiveRecord::Migration +class CreatePlanetRaces < ActiveRecord::Migration[4.2] def change create_table :planet_races do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233245_create_planet_floras.rb b/db/migrate/20180130233245_create_planet_floras.rb index 93831399..e991d436 100644 --- a/db/migrate/20180130233245_create_planet_floras.rb +++ b/db/migrate/20180130233245_create_planet_floras.rb @@ -1,4 +1,4 @@ -class CreatePlanetFloras < ActiveRecord::Migration +class CreatePlanetFloras < ActiveRecord::Migration[4.2] def change create_table :planet_floras do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233250_create_planet_creatures.rb b/db/migrate/20180130233250_create_planet_creatures.rb index 591aadb3..8bd7b4c7 100644 --- a/db/migrate/20180130233250_create_planet_creatures.rb +++ b/db/migrate/20180130233250_create_planet_creatures.rb @@ -1,4 +1,4 @@ -class CreatePlanetCreatures < ActiveRecord::Migration +class CreatePlanetCreatures < ActiveRecord::Migration[4.2] def change create_table :planet_creatures do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233256_create_planet_religions.rb b/db/migrate/20180130233256_create_planet_religions.rb index 44498535..d6747f30 100644 --- a/db/migrate/20180130233256_create_planet_religions.rb +++ b/db/migrate/20180130233256_create_planet_religions.rb @@ -1,4 +1,4 @@ -class CreatePlanetReligions < ActiveRecord::Migration +class CreatePlanetReligions < ActiveRecord::Migration[4.2] def change create_table :planet_religions do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233301_create_planet_deities.rb b/db/migrate/20180130233301_create_planet_deities.rb index 5eb0080f..8638684e 100644 --- a/db/migrate/20180130233301_create_planet_deities.rb +++ b/db/migrate/20180130233301_create_planet_deities.rb @@ -1,4 +1,4 @@ -class CreatePlanetDeities < ActiveRecord::Migration +class CreatePlanetDeities < ActiveRecord::Migration[4.2] def change create_table :planet_deities do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233306_create_planet_groups.rb b/db/migrate/20180130233306_create_planet_groups.rb index 64edf65b..c3ba0222 100644 --- a/db/migrate/20180130233306_create_planet_groups.rb +++ b/db/migrate/20180130233306_create_planet_groups.rb @@ -1,4 +1,4 @@ -class CreatePlanetGroups < ActiveRecord::Migration +class CreatePlanetGroups < ActiveRecord::Migration[4.2] def change create_table :planet_groups do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233311_create_planet_languages.rb b/db/migrate/20180130233311_create_planet_languages.rb index 3b42e231..edb3eb62 100644 --- a/db/migrate/20180130233311_create_planet_languages.rb +++ b/db/migrate/20180130233311_create_planet_languages.rb @@ -1,4 +1,4 @@ -class CreatePlanetLanguages < ActiveRecord::Migration +class CreatePlanetLanguages < ActiveRecord::Migration[4.2] def change create_table :planet_languages do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233316_create_planet_towns.rb b/db/migrate/20180130233316_create_planet_towns.rb index 0386ee6e..9ff278ee 100644 --- a/db/migrate/20180130233316_create_planet_towns.rb +++ b/db/migrate/20180130233316_create_planet_towns.rb @@ -1,4 +1,4 @@ -class CreatePlanetTowns < ActiveRecord::Migration +class CreatePlanetTowns < ActiveRecord::Migration[4.2] def change create_table :planet_towns do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233539_create_planet_nearby_planets.rb b/db/migrate/20180130233539_create_planet_nearby_planets.rb index b9fb8dba..0946a32d 100644 --- a/db/migrate/20180130233539_create_planet_nearby_planets.rb +++ b/db/migrate/20180130233539_create_planet_nearby_planets.rb @@ -1,4 +1,4 @@ -class CreatePlanetNearbyPlanets < ActiveRecord::Migration +class CreatePlanetNearbyPlanets < ActiveRecord::Migration[4.2] def change create_table :planet_nearby_planets do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233841_create_technology_characters.rb b/db/migrate/20180130233841_create_technology_characters.rb index e5c4b18a..1295776e 100644 --- a/db/migrate/20180130233841_create_technology_characters.rb +++ b/db/migrate/20180130233841_create_technology_characters.rb @@ -1,4 +1,4 @@ -class CreateTechnologyCharacters < ActiveRecord::Migration +class CreateTechnologyCharacters < ActiveRecord::Migration[4.2] def change create_table :technology_characters do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233846_create_technology_towns.rb b/db/migrate/20180130233846_create_technology_towns.rb index cc701fcc..40860568 100644 --- a/db/migrate/20180130233846_create_technology_towns.rb +++ b/db/migrate/20180130233846_create_technology_towns.rb @@ -1,4 +1,4 @@ -class CreateTechnologyTowns < ActiveRecord::Migration +class CreateTechnologyTowns < ActiveRecord::Migration[4.2] def change create_table :technology_towns do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233851_create_technology_countries.rb b/db/migrate/20180130233851_create_technology_countries.rb index 525eb8fd..911121a8 100644 --- a/db/migrate/20180130233851_create_technology_countries.rb +++ b/db/migrate/20180130233851_create_technology_countries.rb @@ -1,4 +1,4 @@ -class CreateTechnologyCountries < ActiveRecord::Migration +class CreateTechnologyCountries < ActiveRecord::Migration[4.2] def change create_table :technology_countries do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233857_create_technology_groups.rb b/db/migrate/20180130233857_create_technology_groups.rb index 67a94159..653388c0 100644 --- a/db/migrate/20180130233857_create_technology_groups.rb +++ b/db/migrate/20180130233857_create_technology_groups.rb @@ -1,4 +1,4 @@ -class CreateTechnologyGroups < ActiveRecord::Migration +class CreateTechnologyGroups < ActiveRecord::Migration[4.2] def change create_table :technology_groups do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233902_create_technology_creatures.rb b/db/migrate/20180130233902_create_technology_creatures.rb index bd2a0754..9aba5851 100644 --- a/db/migrate/20180130233902_create_technology_creatures.rb +++ b/db/migrate/20180130233902_create_technology_creatures.rb @@ -1,4 +1,4 @@ -class CreateTechnologyCreatures < ActiveRecord::Migration +class CreateTechnologyCreatures < ActiveRecord::Migration[4.2] def change create_table :technology_creatures do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233907_create_technology_planets.rb b/db/migrate/20180130233907_create_technology_planets.rb index 8f7d36dd..8bf93a8d 100644 --- a/db/migrate/20180130233907_create_technology_planets.rb +++ b/db/migrate/20180130233907_create_technology_planets.rb @@ -1,4 +1,4 @@ -class CreateTechnologyPlanets < ActiveRecord::Migration +class CreateTechnologyPlanets < ActiveRecord::Migration[4.2] def change create_table :technology_planets do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233912_create_technology_magics.rb b/db/migrate/20180130233912_create_technology_magics.rb index f21668b5..ed2dc804 100644 --- a/db/migrate/20180130233912_create_technology_magics.rb +++ b/db/migrate/20180130233912_create_technology_magics.rb @@ -1,4 +1,4 @@ -class CreateTechnologyMagics < ActiveRecord::Migration +class CreateTechnologyMagics < ActiveRecord::Migration[4.2] def change create_table :technology_magics do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233918_create_technology_parent_technologies.rb b/db/migrate/20180130233918_create_technology_parent_technologies.rb index 732ca462..7c3a26f8 100644 --- a/db/migrate/20180130233918_create_technology_parent_technologies.rb +++ b/db/migrate/20180130233918_create_technology_parent_technologies.rb @@ -1,4 +1,4 @@ -class CreateTechnologyParentTechnologies < ActiveRecord::Migration +class CreateTechnologyParentTechnologies < ActiveRecord::Migration[4.2] def change create_table :technology_parent_technologies do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233923_create_technology_child_technologies.rb b/db/migrate/20180130233923_create_technology_child_technologies.rb index f4f4c8f8..4d93e64f 100644 --- a/db/migrate/20180130233923_create_technology_child_technologies.rb +++ b/db/migrate/20180130233923_create_technology_child_technologies.rb @@ -1,4 +1,4 @@ -class CreateTechnologyChildTechnologies < ActiveRecord::Migration +class CreateTechnologyChildTechnologies < ActiveRecord::Migration[4.2] def change create_table :technology_child_technologies do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130233928_create_technology_related_technologies.rb b/db/migrate/20180130233928_create_technology_related_technologies.rb index 02ea8668..c76bb530 100644 --- a/db/migrate/20180130233928_create_technology_related_technologies.rb +++ b/db/migrate/20180130233928_create_technology_related_technologies.rb @@ -1,4 +1,4 @@ -class CreateTechnologyRelatedTechnologies < ActiveRecord::Migration +class CreateTechnologyRelatedTechnologies < ActiveRecord::Migration[4.2] def change create_table :technology_related_technologies do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234318_create_deity_character_parents.rb b/db/migrate/20180130234318_create_deity_character_parents.rb index 9fc72cb0..e644b18c 100644 --- a/db/migrate/20180130234318_create_deity_character_parents.rb +++ b/db/migrate/20180130234318_create_deity_character_parents.rb @@ -1,4 +1,4 @@ -class CreateDeityCharacterParents < ActiveRecord::Migration +class CreateDeityCharacterParents < ActiveRecord::Migration[4.2] def change create_table :deity_character_parents do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234323_create_deity_character_partners.rb b/db/migrate/20180130234323_create_deity_character_partners.rb index d89a20ad..772bbf8a 100644 --- a/db/migrate/20180130234323_create_deity_character_partners.rb +++ b/db/migrate/20180130234323_create_deity_character_partners.rb @@ -1,4 +1,4 @@ -class CreateDeityCharacterPartners < ActiveRecord::Migration +class CreateDeityCharacterPartners < ActiveRecord::Migration[4.2] def change create_table :deity_character_partners do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234329_create_deity_character_children.rb b/db/migrate/20180130234329_create_deity_character_children.rb index 7fbf0493..4fdd686b 100644 --- a/db/migrate/20180130234329_create_deity_character_children.rb +++ b/db/migrate/20180130234329_create_deity_character_children.rb @@ -1,4 +1,4 @@ -class CreateDeityCharacterChildren < ActiveRecord::Migration +class CreateDeityCharacterChildren < ActiveRecord::Migration[4.2] def change create_table :deity_character_children do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234334_create_deity_deity_parents.rb b/db/migrate/20180130234334_create_deity_deity_parents.rb index 289530ee..a4fbbbe1 100644 --- a/db/migrate/20180130234334_create_deity_deity_parents.rb +++ b/db/migrate/20180130234334_create_deity_deity_parents.rb @@ -1,4 +1,4 @@ -class CreateDeityDeityParents < ActiveRecord::Migration +class CreateDeityDeityParents < ActiveRecord::Migration[4.2] def change create_table :deity_deity_parents do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234339_create_deity_deity_partners.rb b/db/migrate/20180130234339_create_deity_deity_partners.rb index 196fcba3..0d298a2b 100644 --- a/db/migrate/20180130234339_create_deity_deity_partners.rb +++ b/db/migrate/20180130234339_create_deity_deity_partners.rb @@ -1,4 +1,4 @@ -class CreateDeityDeityPartners < ActiveRecord::Migration +class CreateDeityDeityPartners < ActiveRecord::Migration[4.2] def change create_table :deity_deity_partners do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234344_create_deity_deity_children.rb b/db/migrate/20180130234344_create_deity_deity_children.rb index ac1f1af1..74a897b8 100644 --- a/db/migrate/20180130234344_create_deity_deity_children.rb +++ b/db/migrate/20180130234344_create_deity_deity_children.rb @@ -1,4 +1,4 @@ -class CreateDeityDeityChildren < ActiveRecord::Migration +class CreateDeityDeityChildren < ActiveRecord::Migration[4.2] def change create_table :deity_deity_children do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234349_create_deity_creatures.rb b/db/migrate/20180130234349_create_deity_creatures.rb index 469757f9..e8f95bcf 100644 --- a/db/migrate/20180130234349_create_deity_creatures.rb +++ b/db/migrate/20180130234349_create_deity_creatures.rb @@ -1,4 +1,4 @@ -class CreateDeityCreatures < ActiveRecord::Migration +class CreateDeityCreatures < ActiveRecord::Migration[4.2] def change create_table :deity_creatures do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234355_create_deity_floras.rb b/db/migrate/20180130234355_create_deity_floras.rb index b87d9407..53ce678a 100644 --- a/db/migrate/20180130234355_create_deity_floras.rb +++ b/db/migrate/20180130234355_create_deity_floras.rb @@ -1,4 +1,4 @@ -class CreateDeityFloras < ActiveRecord::Migration +class CreateDeityFloras < ActiveRecord::Migration[4.2] def change create_table :deity_floras do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234400_create_deity_religions.rb b/db/migrate/20180130234400_create_deity_religions.rb index e68889fd..d3127f42 100644 --- a/db/migrate/20180130234400_create_deity_religions.rb +++ b/db/migrate/20180130234400_create_deity_religions.rb @@ -1,4 +1,4 @@ -class CreateDeityReligions < ActiveRecord::Migration +class CreateDeityReligions < ActiveRecord::Migration[4.2] def change create_table :deity_religions do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234405_create_deity_relics.rb b/db/migrate/20180130234405_create_deity_relics.rb index 96d53df2..ee08a2f0 100644 --- a/db/migrate/20180130234405_create_deity_relics.rb +++ b/db/migrate/20180130234405_create_deity_relics.rb @@ -1,4 +1,4 @@ -class CreateDeityRelics < ActiveRecord::Migration +class CreateDeityRelics < ActiveRecord::Migration[4.2] def change create_table :deity_relics do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234410_create_deity_abilities.rb b/db/migrate/20180130234410_create_deity_abilities.rb index c580b0a0..6f4aad78 100644 --- a/db/migrate/20180130234410_create_deity_abilities.rb +++ b/db/migrate/20180130234410_create_deity_abilities.rb @@ -1,4 +1,4 @@ -class CreateDeityAbilities < ActiveRecord::Migration +class CreateDeityAbilities < ActiveRecord::Migration[4.2] def change create_table :deity_abilities do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234415_create_deity_related_towns.rb b/db/migrate/20180130234415_create_deity_related_towns.rb index a28ea07b..165db40a 100644 --- a/db/migrate/20180130234415_create_deity_related_towns.rb +++ b/db/migrate/20180130234415_create_deity_related_towns.rb @@ -1,4 +1,4 @@ -class CreateDeityRelatedTowns < ActiveRecord::Migration +class CreateDeityRelatedTowns < ActiveRecord::Migration[4.2] def change create_table :deity_related_towns do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234420_create_deity_related_landmarks.rb b/db/migrate/20180130234420_create_deity_related_landmarks.rb index 37a05875..ed53f22d 100644 --- a/db/migrate/20180130234420_create_deity_related_landmarks.rb +++ b/db/migrate/20180130234420_create_deity_related_landmarks.rb @@ -1,4 +1,4 @@ -class CreateDeityRelatedLandmarks < ActiveRecord::Migration +class CreateDeityRelatedLandmarks < ActiveRecord::Migration[4.2] def change create_table :deity_related_landmarks do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234505_create_government_leaders.rb b/db/migrate/20180130234505_create_government_leaders.rb index 64052334..c5af39c2 100644 --- a/db/migrate/20180130234505_create_government_leaders.rb +++ b/db/migrate/20180130234505_create_government_leaders.rb @@ -1,4 +1,4 @@ -class CreateGovernmentLeaders < ActiveRecord::Migration +class CreateGovernmentLeaders < ActiveRecord::Migration[4.2] def change create_table :government_leaders do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234511_create_government_groups.rb b/db/migrate/20180130234511_create_government_groups.rb index c620f36d..2ca23411 100644 --- a/db/migrate/20180130234511_create_government_groups.rb +++ b/db/migrate/20180130234511_create_government_groups.rb @@ -1,4 +1,4 @@ -class CreateGovernmentGroups < ActiveRecord::Migration +class CreateGovernmentGroups < ActiveRecord::Migration[4.2] def change create_table :government_groups do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234516_create_government_political_figures.rb b/db/migrate/20180130234516_create_government_political_figures.rb index b502720b..1a52a91a 100644 --- a/db/migrate/20180130234516_create_government_political_figures.rb +++ b/db/migrate/20180130234516_create_government_political_figures.rb @@ -1,4 +1,4 @@ -class CreateGovernmentPoliticalFigures < ActiveRecord::Migration +class CreateGovernmentPoliticalFigures < ActiveRecord::Migration[4.2] def change create_table :government_political_figures do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234521_create_government_items.rb b/db/migrate/20180130234521_create_government_items.rb index a8d341cf..62ae490c 100644 --- a/db/migrate/20180130234521_create_government_items.rb +++ b/db/migrate/20180130234521_create_government_items.rb @@ -1,4 +1,4 @@ -class CreateGovernmentItems < ActiveRecord::Migration +class CreateGovernmentItems < ActiveRecord::Migration[4.2] def change create_table :government_items do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234526_create_government_technologies.rb b/db/migrate/20180130234526_create_government_technologies.rb index c46886bf..0d145d60 100644 --- a/db/migrate/20180130234526_create_government_technologies.rb +++ b/db/migrate/20180130234526_create_government_technologies.rb @@ -1,4 +1,4 @@ -class CreateGovernmentTechnologies < ActiveRecord::Migration +class CreateGovernmentTechnologies < ActiveRecord::Migration[4.2] def change create_table :government_technologies do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180130234531_create_government_creatures.rb b/db/migrate/20180130234531_create_government_creatures.rb index 1b233d63..0ba6413b 100644 --- a/db/migrate/20180130234531_create_government_creatures.rb +++ b/db/migrate/20180130234531_create_government_creatures.rb @@ -1,4 +1,4 @@ -class CreateGovernmentCreatures < ActiveRecord::Migration +class CreateGovernmentCreatures < ActiveRecord::Migration[4.2] def change create_table :government_creatures do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180131055724_create_character_items.rb b/db/migrate/20180131055724_create_character_items.rb index 986c0bd3..66df7141 100644 --- a/db/migrate/20180131055724_create_character_items.rb +++ b/db/migrate/20180131055724_create_character_items.rb @@ -1,4 +1,4 @@ -class CreateCharacterItems < ActiveRecord::Migration +class CreateCharacterItems < ActiveRecord::Migration[4.2] def change create_table :character_items do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180131055729_create_character_technologies.rb b/db/migrate/20180131055729_create_character_technologies.rb index f99a6d27..f61fe6ab 100644 --- a/db/migrate/20180131055729_create_character_technologies.rb +++ b/db/migrate/20180131055729_create_character_technologies.rb @@ -1,4 +1,4 @@ -class CreateCharacterTechnologies < ActiveRecord::Migration +class CreateCharacterTechnologies < ActiveRecord::Migration[4.2] def change create_table :character_technologies do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180131055734_create_character_floras.rb b/db/migrate/20180131055734_create_character_floras.rb index e6f8afe2..71eb34dc 100644 --- a/db/migrate/20180131055734_create_character_floras.rb +++ b/db/migrate/20180131055734_create_character_floras.rb @@ -1,4 +1,4 @@ -class CreateCharacterFloras < ActiveRecord::Migration +class CreateCharacterFloras < ActiveRecord::Migration[4.2] def change create_table :character_floras do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180131055739_create_character_friends.rb b/db/migrate/20180131055739_create_character_friends.rb index 23b9bce5..13cb8d20 100644 --- a/db/migrate/20180131055739_create_character_friends.rb +++ b/db/migrate/20180131055739_create_character_friends.rb @@ -1,4 +1,4 @@ -class CreateCharacterFriends < ActiveRecord::Migration +class CreateCharacterFriends < ActiveRecord::Migration[4.2] def change create_table :character_friends do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180131055744_create_character_companions.rb b/db/migrate/20180131055744_create_character_companions.rb index 3497550e..afa6ebeb 100644 --- a/db/migrate/20180131055744_create_character_companions.rb +++ b/db/migrate/20180131055744_create_character_companions.rb @@ -1,4 +1,4 @@ -class CreateCharacterCompanions < ActiveRecord::Migration +class CreateCharacterCompanions < ActiveRecord::Migration[4.2] def change create_table :character_companions do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180131060014_create_character_birthtowns.rb b/db/migrate/20180131060014_create_character_birthtowns.rb index 053dcb86..97f3251d 100644 --- a/db/migrate/20180131060014_create_character_birthtowns.rb +++ b/db/migrate/20180131060014_create_character_birthtowns.rb @@ -1,4 +1,4 @@ -class CreateCharacterBirthtowns < ActiveRecord::Migration +class CreateCharacterBirthtowns < ActiveRecord::Migration[4.2] def change create_table :character_birthtowns do |t| t.references :user, index: true, foreign_key: true diff --git a/db/migrate/20180131061140_create_location_capital_towns.rb b/db/migrate/20180131061140_create_location_capital_towns.rb index 5a4c044f..895d8a0a 100644 --- a/db/migrate/20180131061140_create_location_capital_towns.rb +++ b/db/migrate/20180131061140_create_location_capital_towns.rb @@ -1,4 +1,4 @@ -class CreateLocationCapitalTowns < ActiveRecord::Migration +class CreateLocationCapitalTowns < ActiveRecord::Migration[4.2] def change create_table :location_capital_towns do |t| t.references :location, index: true, foreign_key: true diff --git a/db/migrate/20180131061146_create_location_largest_towns.rb b/db/migrate/20180131061146_create_location_largest_towns.rb index 6c9701c5..a8bfe532 100644 --- a/db/migrate/20180131061146_create_location_largest_towns.rb +++ b/db/migrate/20180131061146_create_location_largest_towns.rb @@ -1,4 +1,4 @@ -class CreateLocationLargestTowns < ActiveRecord::Migration +class CreateLocationLargestTowns < ActiveRecord::Migration[4.2] def change create_table :location_largest_towns do |t| t.references :location, index: true, foreign_key: true diff --git a/db/migrate/20180131061151_create_location_notable_towns.rb b/db/migrate/20180131061151_create_location_notable_towns.rb index aa361f38..7c3d702c 100644 --- a/db/migrate/20180131061151_create_location_notable_towns.rb +++ b/db/migrate/20180131061151_create_location_notable_towns.rb @@ -1,4 +1,4 @@ -class CreateLocationNotableTowns < ActiveRecord::Migration +class CreateLocationNotableTowns < ActiveRecord::Migration[4.2] def change create_table :location_notable_towns do |t| t.references :location, index: true, foreign_key: true diff --git a/db/migrate/20180131061726_create_location_landmarks.rb b/db/migrate/20180131061726_create_location_landmarks.rb index 5c2a5a2b..e584603b 100644 --- a/db/migrate/20180131061726_create_location_landmarks.rb +++ b/db/migrate/20180131061726_create_location_landmarks.rb @@ -1,4 +1,4 @@ -class CreateLocationLandmarks < ActiveRecord::Migration +class CreateLocationLandmarks < ActiveRecord::Migration[4.2] def change create_table :location_landmarks do |t| t.references :location, index: true, foreign_key: true diff --git a/db/migrate/20180131061902_create_item_magics.rb b/db/migrate/20180131061902_create_item_magics.rb index eb2e1adb..f151f8df 100644 --- a/db/migrate/20180131061902_create_item_magics.rb +++ b/db/migrate/20180131061902_create_item_magics.rb @@ -1,4 +1,4 @@ -class CreateItemMagics < ActiveRecord::Migration +class CreateItemMagics < ActiveRecord::Migration[4.2] def change create_table :item_magics do |t| t.references :item, index: true, foreign_key: true diff --git a/db/migrate/20180131062407_create_country_governments.rb b/db/migrate/20180131062407_create_country_governments.rb index fad0016c..df9c7d1d 100644 --- a/db/migrate/20180131062407_create_country_governments.rb +++ b/db/migrate/20180131062407_create_country_governments.rb @@ -1,4 +1,4 @@ -class CreateCountryGovernments < ActiveRecord::Migration +class CreateCountryGovernments < ActiveRecord::Migration[4.2] def change create_table :country_governments do |t| t.references :country, index: true, foreign_key: true diff --git a/db/migrate/20180131062923_create_group_creatures.rb b/db/migrate/20180131062923_create_group_creatures.rb index f6d5fe29..147f752d 100644 --- a/db/migrate/20180131062923_create_group_creatures.rb +++ b/db/migrate/20180131062923_create_group_creatures.rb @@ -1,4 +1,4 @@ -class CreateGroupCreatures < ActiveRecord::Migration +class CreateGroupCreatures < ActiveRecord::Migration[4.2] def change create_table :group_creatures do |t| t.references :group, index: true, foreign_key: true diff --git a/db/migrate/20180131063312_create_character_magics.rb b/db/migrate/20180131063312_create_character_magics.rb index e5749933..e3e5c0b9 100644 --- a/db/migrate/20180131063312_create_character_magics.rb +++ b/db/migrate/20180131063312_create_character_magics.rb @@ -1,4 +1,4 @@ -class CreateCharacterMagics < ActiveRecord::Migration +class CreateCharacterMagics < ActiveRecord::Migration[4.2] def change create_table :character_magics do |t| t.references :character, index: true, foreign_key: true diff --git a/db/migrate/20180131063532_create_character_enemies.rb b/db/migrate/20180131063532_create_character_enemies.rb index 9ede9964..7c85ec8c 100644 --- a/db/migrate/20180131063532_create_character_enemies.rb +++ b/db/migrate/20180131063532_create_character_enemies.rb @@ -1,4 +1,4 @@ -class CreateCharacterEnemies < ActiveRecord::Migration +class CreateCharacterEnemies < ActiveRecord::Migration[4.2] def change create_table :character_enemies do |t| t.references :character, index: true, foreign_key: true diff --git a/db/migrate/20180131064051_add_classification_fields_to_creatures.rb b/db/migrate/20180131064051_add_classification_fields_to_creatures.rb index 0954fe18..1db27f15 100644 --- a/db/migrate/20180131064051_add_classification_fields_to_creatures.rb +++ b/db/migrate/20180131064051_add_classification_fields_to_creatures.rb @@ -1,4 +1,4 @@ -class AddClassificationFieldsToCreatures < ActiveRecord::Migration +class AddClassificationFieldsToCreatures < ActiveRecord::Migration[4.2] def change add_column :creatures, :phylum, :string add_column :creatures, :class_string, :string diff --git a/db/migrate/20180131064902_add_material_uses_to_flora.rb b/db/migrate/20180131064902_add_material_uses_to_flora.rb index e134b3e1..2b8de567 100644 --- a/db/migrate/20180131064902_add_material_uses_to_flora.rb +++ b/db/migrate/20180131064902_add_material_uses_to_flora.rb @@ -1,4 +1,4 @@ -class AddMaterialUsesToFlora < ActiveRecord::Migration +class AddMaterialUsesToFlora < ActiveRecord::Migration[4.2] def change add_column :floras, :material_uses, :string end diff --git a/db/migrate/20180202055802_create_deity_character_siblings.rb b/db/migrate/20180202055802_create_deity_character_siblings.rb index 49f31633..d1e6bcfc 100644 --- a/db/migrate/20180202055802_create_deity_character_siblings.rb +++ b/db/migrate/20180202055802_create_deity_character_siblings.rb @@ -1,4 +1,4 @@ -class CreateDeityCharacterSiblings < ActiveRecord::Migration +class CreateDeityCharacterSiblings < ActiveRecord::Migration[4.2] def change create_table :deity_character_siblings do |t| t.references :deity, index: true, foreign_key: true diff --git a/db/migrate/20180202055822_create_deity_deity_siblings.rb b/db/migrate/20180202055822_create_deity_deity_siblings.rb index cc110a8c..c6293101 100644 --- a/db/migrate/20180202055822_create_deity_deity_siblings.rb +++ b/db/migrate/20180202055822_create_deity_deity_siblings.rb @@ -1,4 +1,4 @@ -class CreateDeityDeitySiblings < ActiveRecord::Migration +class CreateDeityDeitySiblings < ActiveRecord::Migration[4.2] def change create_table :deity_deity_siblings do |t| t.references :deity, index: true, foreign_key: true diff --git a/db/migrate/20180202064238_create_deity_races.rb b/db/migrate/20180202064238_create_deity_races.rb index 6dd23fe5..84b04c51 100644 --- a/db/migrate/20180202064238_create_deity_races.rb +++ b/db/migrate/20180202064238_create_deity_races.rb @@ -1,4 +1,4 @@ -class CreateDeityRaces < ActiveRecord::Migration +class CreateDeityRaces < ActiveRecord::Migration[4.2] def change create_table :deity_races do |t| t.references :deity, index: true, foreign_key: true diff --git a/db/migrate/20180620012919_add_forum_moderator_flag_to_users.rb b/db/migrate/20180620012919_add_forum_moderator_flag_to_users.rb index 36be4251..9e67f972 100644 --- a/db/migrate/20180620012919_add_forum_moderator_flag_to_users.rb +++ b/db/migrate/20180620012919_add_forum_moderator_flag_to_users.rb @@ -1,4 +1,4 @@ -class AddForumModeratorFlagToUsers < ActiveRecord::Migration +class AddForumModeratorFlagToUsers < ActiveRecord::Migration[4.2] def change add_column :users, :forum_moderator, :boolean, default: false end From 1a666a96540b86f43a1d438f2acc3c178d63560c Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 5 Jul 2018 01:19:03 -0500 Subject: [PATCH 08/26] oops --- app/models/attribute.rb | 2 +- app/models/attribute_category.rb | 2 +- app/models/attribute_field.rb | 2 +- app/models/billing_plan.rb | 2 +- app/models/content_change_event.rb | 2 +- app/models/content_groupers/archenemyship.rb | 2 +- app/models/content_groupers/artifactship.rb | 2 +- app/models/content_groupers/best_friendship.rb | 2 +- app/models/content_groupers/birthing.rb | 2 +- app/models/content_groupers/capital_cities_relationship.rb | 2 +- app/models/content_groupers/character_birthtown.rb | 2 +- app/models/content_groupers/character_companion.rb | 2 +- app/models/content_groupers/character_enemy.rb | 2 +- app/models/content_groupers/character_flora.rb | 2 +- app/models/content_groupers/character_friend.rb | 2 +- app/models/content_groupers/character_item.rb | 2 +- app/models/content_groupers/character_love_interest.rb | 2 +- app/models/content_groupers/character_magic.rb | 2 +- app/models/content_groupers/character_technology.rb | 2 +- app/models/content_groupers/childrenship.rb | 2 +- app/models/content_groupers/country_creature.rb | 2 +- app/models/content_groupers/country_flora.rb | 2 +- app/models/content_groupers/country_government.rb | 2 +- app/models/content_groupers/country_landmark.rb | 2 +- app/models/content_groupers/country_language.rb | 2 +- app/models/content_groupers/country_location.rb | 2 +- app/models/content_groupers/country_religion.rb | 2 +- app/models/content_groupers/country_town.rb | 2 +- app/models/content_groupers/creature_relationship.rb | 2 +- app/models/content_groupers/current_ownership.rb | 2 +- app/models/content_groupers/deity_ability.rb | 2 +- app/models/content_groupers/deity_character_child.rb | 2 +- app/models/content_groupers/deity_character_parent.rb | 2 +- app/models/content_groupers/deity_character_partner.rb | 2 +- app/models/content_groupers/deity_character_sibling.rb | 2 +- app/models/content_groupers/deity_creature.rb | 2 +- app/models/content_groupers/deity_deity_child.rb | 2 +- app/models/content_groupers/deity_deity_parent.rb | 2 +- app/models/content_groupers/deity_deity_partner.rb | 2 +- app/models/content_groupers/deity_deity_sibling.rb | 2 +- app/models/content_groupers/deity_flora.rb | 2 +- app/models/content_groupers/deity_race.rb | 2 +- app/models/content_groupers/deity_related_landmark.rb | 2 +- app/models/content_groupers/deity_related_town.rb | 2 +- app/models/content_groupers/deity_relic.rb | 2 +- app/models/content_groupers/deity_religion.rb | 2 +- app/models/content_groupers/deityship.rb | 2 +- app/models/content_groupers/famous_figureship.rb | 2 +- app/models/content_groupers/fathership.rb | 2 +- app/models/content_groupers/flora_eaten_by.rb | 2 +- app/models/content_groupers/flora_location.rb | 2 +- app/models/content_groupers/flora_magical_effect.rb | 2 +- app/models/content_groupers/flora_relationship.rb | 2 +- app/models/content_groupers/government_creature.rb | 2 +- app/models/content_groupers/government_group.rb | 2 +- app/models/content_groupers/government_item.rb | 2 +- app/models/content_groupers/government_leader.rb | 2 +- app/models/content_groupers/government_political_figure.rb | 2 +- app/models/content_groupers/government_technology.rb | 2 +- app/models/content_groupers/group_allyship.rb | 2 +- app/models/content_groupers/group_clientship.rb | 2 +- app/models/content_groupers/group_creature.rb | 2 +- app/models/content_groupers/group_enemyship.rb | 2 +- app/models/content_groupers/group_equipmentship.rb | 2 +- app/models/content_groupers/group_leadership.rb | 2 +- app/models/content_groupers/group_locationship.rb | 2 +- app/models/content_groupers/group_membership.rb | 2 +- app/models/content_groupers/group_rivalship.rb | 2 +- app/models/content_groupers/group_suppliership.rb | 2 +- app/models/content_groupers/headquartership.rb | 2 +- app/models/content_groupers/item_magic.rb | 2 +- app/models/content_groupers/key_itemship.rb | 2 +- app/models/content_groupers/landmark_country.rb | 2 +- app/models/content_groupers/landmark_creature.rb | 2 +- app/models/content_groupers/landmark_flora.rb | 2 +- app/models/content_groupers/landmark_nearby_town.rb | 2 +- app/models/content_groupers/largest_cities_relationship.rb | 2 +- app/models/content_groupers/lingualism.rb | 2 +- app/models/content_groupers/location_capital_town.rb | 2 +- app/models/content_groupers/location_landmark.rb | 2 +- app/models/content_groupers/location_languageship.rb | 2 +- app/models/content_groupers/location_largest_town.rb | 2 +- app/models/content_groupers/location_leadership.rb | 2 +- app/models/content_groupers/location_notable_town.rb | 2 +- app/models/content_groupers/magic_deityship.rb | 2 +- app/models/content_groupers/maker_relationship.rb | 2 +- app/models/content_groupers/marriage.rb | 2 +- app/models/content_groupers/mothership.rb | 2 +- app/models/content_groupers/notable_cities_relationship.rb | 2 +- app/models/content_groupers/officeship.rb | 2 +- app/models/content_groupers/original_ownership.rb | 2 +- app/models/content_groupers/past_ownership.rb | 2 +- app/models/content_groupers/planet_country.rb | 2 +- app/models/content_groupers/planet_creature.rb | 2 +- app/models/content_groupers/planet_deity.rb | 2 +- app/models/content_groupers/planet_flora.rb | 2 +- app/models/content_groupers/planet_group.rb | 2 +- app/models/content_groupers/planet_landmark.rb | 2 +- app/models/content_groupers/planet_language.rb | 2 +- app/models/content_groupers/planet_location.rb | 2 +- app/models/content_groupers/planet_nearby_planet.rb | 2 +- app/models/content_groupers/planet_race.rb | 2 +- app/models/content_groupers/planet_religion.rb | 2 +- app/models/content_groupers/planet_town.rb | 2 +- app/models/content_groupers/raceship.rb | 2 +- app/models/content_groupers/religious_figureship.rb | 2 +- app/models/content_groupers/religious_locationship.rb | 2 +- app/models/content_groupers/religious_raceship.rb | 2 +- app/models/content_groupers/scene_charactership.rb | 2 +- app/models/content_groupers/scene_itemship.rb | 2 +- app/models/content_groupers/scene_locationship.rb | 2 +- app/models/content_groupers/siblingship.rb | 2 +- app/models/content_groupers/sistergroupship.rb | 2 +- app/models/content_groupers/subgroupship.rb | 2 +- app/models/content_groupers/supergroupship.rb | 2 +- app/models/content_groupers/technology_character.rb | 2 +- app/models/content_groupers/technology_child_technology.rb | 2 +- app/models/content_groupers/technology_country.rb | 2 +- app/models/content_groupers/technology_creature.rb | 2 +- app/models/content_groupers/technology_group.rb | 2 +- app/models/content_groupers/technology_magic.rb | 2 +- app/models/content_groupers/technology_parent_technology.rb | 2 +- app/models/content_groupers/technology_planet.rb | 2 +- app/models/content_groupers/technology_related_technology.rb | 2 +- app/models/content_groupers/technology_town.rb | 2 +- app/models/content_groupers/town_citizen.rb | 2 +- app/models/content_groupers/town_country.rb | 2 +- app/models/content_groupers/town_creature.rb | 2 +- app/models/content_groupers/town_flora.rb | 2 +- app/models/content_groupers/town_group.rb | 2 +- app/models/content_groupers/town_language.rb | 2 +- app/models/content_groupers/town_nearby_landmark.rb | 2 +- app/models/content_groupers/wildlifeship.rb | 2 +- app/models/content_types/character.rb | 2 +- app/models/content_types/country.rb | 2 +- app/models/content_types/creature.rb | 2 +- app/models/content_types/deity.rb | 2 +- app/models/content_types/flora.rb | 2 +- app/models/content_types/government.rb | 2 +- app/models/content_types/group.rb | 2 +- app/models/content_types/item.rb | 2 +- app/models/content_types/landmark.rb | 2 +- app/models/content_types/language.rb | 2 +- app/models/content_types/location.rb | 2 +- app/models/content_types/magic.rb | 2 +- app/models/content_types/planet.rb | 2 +- app/models/content_types/race.rb | 2 +- app/models/content_types/religion.rb | 2 +- app/models/content_types/scene.rb | 2 +- app/models/content_types/technology.rb | 2 +- app/models/content_types/town.rb | 2 +- app/models/content_types/universe.rb | 2 +- app/models/contributor.rb | 2 +- app/models/document.rb | 2 +- app/models/image_upload.rb | 2 +- app/models/raffle_entry.rb | 2 +- app/models/referral.rb | 2 +- app/models/referral_code.rb | 2 +- app/models/stripe_event_log.rb | 2 +- app/models/subscription.rb | 2 +- app/models/user.rb | 2 +- app/models/user_content_type_activator.rb | 2 +- app/models/votable.rb | 2 +- app/models/vote.rb | 2 +- 164 files changed, 164 insertions(+), 164 deletions(-) diff --git a/app/models/attribute.rb b/app/models/attribute.rb index 87f03e55..26259abd 100644 --- a/app/models/attribute.rb +++ b/app/models/attribute.rb @@ -1,4 +1,4 @@ -class Attribute < ActiveRecord +class Attribute < ApplicationRecord belongs_to :user belongs_to :attribute_field belongs_to :entity, polymorphic: true diff --git a/app/models/attribute_category.rb b/app/models/attribute_category.rb index 020643b8..e66f05fd 100644 --- a/app/models/attribute_category.rb +++ b/app/models/attribute_category.rb @@ -1,4 +1,4 @@ -class AttributeCategory < ActiveRecord +class AttributeCategory < ApplicationRecord validates :name, presence: true belongs_to :user diff --git a/app/models/attribute_field.rb b/app/models/attribute_field.rb index 1980cd00..484d9912 100644 --- a/app/models/attribute_field.rb +++ b/app/models/attribute_field.rb @@ -1,4 +1,4 @@ -class AttributeField < ActiveRecord +class AttributeField < ApplicationRecord validates :name, presence: true belongs_to :user diff --git a/app/models/billing_plan.rb b/app/models/billing_plan.rb index abeaa8f3..ce48e2ef 100644 --- a/app/models/billing_plan.rb +++ b/app/models/billing_plan.rb @@ -1,3 +1,3 @@ -class BillingPlan < ActiveRecord +class BillingPlan < ApplicationRecord PREMIUM_IDS = [2, 3, 4, 5, 6] end diff --git a/app/models/content_change_event.rb b/app/models/content_change_event.rb index 254d994a..485f5932 100644 --- a/app/models/content_change_event.rb +++ b/app/models/content_change_event.rb @@ -1,4 +1,4 @@ -class ContentChangeEvent < ActiveRecord +class ContentChangeEvent < ApplicationRecord belongs_to :user serialize :changed_fields, Hash diff --git a/app/models/content_groupers/archenemyship.rb b/app/models/content_groupers/archenemyship.rb index a8cab8af..299c4656 100644 --- a/app/models/content_groupers/archenemyship.rb +++ b/app/models/content_groupers/archenemyship.rb @@ -1,4 +1,4 @@ -class Archenemyship < ActiveRecord +class Archenemyship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/artifactship.rb b/app/models/content_groupers/artifactship.rb index 450bfb8e..b9f8fbb3 100644 --- a/app/models/content_groupers/artifactship.rb +++ b/app/models/content_groupers/artifactship.rb @@ -1,4 +1,4 @@ -class Artifactship < ActiveRecord +class Artifactship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/best_friendship.rb b/app/models/content_groupers/best_friendship.rb index ac9c8a0a..ac88b25d 100644 --- a/app/models/content_groupers/best_friendship.rb +++ b/app/models/content_groupers/best_friendship.rb @@ -1,4 +1,4 @@ -class BestFriendship < ActiveRecord +class BestFriendship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/birthing.rb b/app/models/content_groupers/birthing.rb index 1762c4c2..1216e620 100644 --- a/app/models/content_groupers/birthing.rb +++ b/app/models/content_groupers/birthing.rb @@ -1,4 +1,4 @@ -class Birthing < ActiveRecord +class Birthing < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/capital_cities_relationship.rb b/app/models/content_groupers/capital_cities_relationship.rb index 0b491ba8..f97ab0f8 100644 --- a/app/models/content_groupers/capital_cities_relationship.rb +++ b/app/models/content_groupers/capital_cities_relationship.rb @@ -1,6 +1,6 @@ # Defines a relation between a location and any capital cities within it, # and a reverse relation for all locations in which they are the capital of. -class CapitalCitiesRelationship < ActiveRecord +class CapitalCitiesRelationship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/character_birthtown.rb b/app/models/content_groupers/character_birthtown.rb index 10447618..ec0e6e52 100644 --- a/app/models/content_groupers/character_birthtown.rb +++ b/app/models/content_groupers/character_birthtown.rb @@ -1,4 +1,4 @@ -class CharacterBirthtown < ActiveRecord +class CharacterBirthtown < ApplicationRecord belongs_to :user belongs_to :character belongs_to :birthtown, class_name: Town.name diff --git a/app/models/content_groupers/character_companion.rb b/app/models/content_groupers/character_companion.rb index 19b9f1ab..a06c7fa4 100644 --- a/app/models/content_groupers/character_companion.rb +++ b/app/models/content_groupers/character_companion.rb @@ -1,4 +1,4 @@ -class CharacterCompanion < ActiveRecord +class CharacterCompanion < ApplicationRecord belongs_to :user belongs_to :character belongs_to :companion, class_name: Creature.name diff --git a/app/models/content_groupers/character_enemy.rb b/app/models/content_groupers/character_enemy.rb index 9d984a0b..ea215781 100644 --- a/app/models/content_groupers/character_enemy.rb +++ b/app/models/content_groupers/character_enemy.rb @@ -1,4 +1,4 @@ -class CharacterEnemy < ActiveRecord +class CharacterEnemy < ApplicationRecord belongs_to :character belongs_to :user belongs_to :enemy, class_name: Character.name diff --git a/app/models/content_groupers/character_flora.rb b/app/models/content_groupers/character_flora.rb index 7b15c23d..80108988 100644 --- a/app/models/content_groupers/character_flora.rb +++ b/app/models/content_groupers/character_flora.rb @@ -1,4 +1,4 @@ -class CharacterFlora < ActiveRecord +class CharacterFlora < ApplicationRecord belongs_to :user belongs_to :character belongs_to :flora diff --git a/app/models/content_groupers/character_friend.rb b/app/models/content_groupers/character_friend.rb index f36f10f7..9ce88ec6 100644 --- a/app/models/content_groupers/character_friend.rb +++ b/app/models/content_groupers/character_friend.rb @@ -1,4 +1,4 @@ -class CharacterFriend < ActiveRecord +class CharacterFriend < ApplicationRecord belongs_to :user belongs_to :character belongs_to :friend, class_name: Character.name diff --git a/app/models/content_groupers/character_item.rb b/app/models/content_groupers/character_item.rb index a602643a..fcdf5e43 100644 --- a/app/models/content_groupers/character_item.rb +++ b/app/models/content_groupers/character_item.rb @@ -1,4 +1,4 @@ -class CharacterItem < ActiveRecord +class CharacterItem < ApplicationRecord belongs_to :user belongs_to :character belongs_to :item diff --git a/app/models/content_groupers/character_love_interest.rb b/app/models/content_groupers/character_love_interest.rb index 8b2c4175..cd504e54 100644 --- a/app/models/content_groupers/character_love_interest.rb +++ b/app/models/content_groupers/character_love_interest.rb @@ -1,4 +1,4 @@ -class CharacterLoveInterest < ActiveRecord +class CharacterLoveInterest < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/character_magic.rb b/app/models/content_groupers/character_magic.rb index 1d19e00d..1d97274e 100644 --- a/app/models/content_groupers/character_magic.rb +++ b/app/models/content_groupers/character_magic.rb @@ -1,4 +1,4 @@ -class CharacterMagic < ActiveRecord +class CharacterMagic < ApplicationRecord belongs_to :character belongs_to :magic belongs_to :user diff --git a/app/models/content_groupers/character_technology.rb b/app/models/content_groupers/character_technology.rb index 48eb34ef..88650066 100644 --- a/app/models/content_groupers/character_technology.rb +++ b/app/models/content_groupers/character_technology.rb @@ -1,4 +1,4 @@ -class CharacterTechnology < ActiveRecord +class CharacterTechnology < ApplicationRecord belongs_to :user belongs_to :character belongs_to :technology diff --git a/app/models/content_groupers/childrenship.rb b/app/models/content_groupers/childrenship.rb index 5bbf8741..ee2fc386 100644 --- a/app/models/content_groupers/childrenship.rb +++ b/app/models/content_groupers/childrenship.rb @@ -1,4 +1,4 @@ -class Childrenship < ActiveRecord +class Childrenship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/country_creature.rb b/app/models/content_groupers/country_creature.rb index b96d6c93..d55c82a4 100644 --- a/app/models/content_groupers/country_creature.rb +++ b/app/models/content_groupers/country_creature.rb @@ -1,4 +1,4 @@ -class CountryCreature < ActiveRecord +class CountryCreature < ApplicationRecord belongs_to :user belongs_to :country belongs_to :creature diff --git a/app/models/content_groupers/country_flora.rb b/app/models/content_groupers/country_flora.rb index d1f42f8a..e0788967 100644 --- a/app/models/content_groupers/country_flora.rb +++ b/app/models/content_groupers/country_flora.rb @@ -1,4 +1,4 @@ -class CountryFlora < ActiveRecord +class CountryFlora < ApplicationRecord belongs_to :user belongs_to :country belongs_to :flora diff --git a/app/models/content_groupers/country_government.rb b/app/models/content_groupers/country_government.rb index d86bb805..f0688cde 100644 --- a/app/models/content_groupers/country_government.rb +++ b/app/models/content_groupers/country_government.rb @@ -1,4 +1,4 @@ -class CountryGovernment < ActiveRecord +class CountryGovernment < ApplicationRecord belongs_to :country belongs_to :government belongs_to :user diff --git a/app/models/content_groupers/country_landmark.rb b/app/models/content_groupers/country_landmark.rb index ec1886dd..797ed611 100644 --- a/app/models/content_groupers/country_landmark.rb +++ b/app/models/content_groupers/country_landmark.rb @@ -1,4 +1,4 @@ -class CountryLandmark < ActiveRecord +class CountryLandmark < ApplicationRecord belongs_to :user belongs_to :country belongs_to :landmark diff --git a/app/models/content_groupers/country_language.rb b/app/models/content_groupers/country_language.rb index 6669dd53..7aef11a2 100644 --- a/app/models/content_groupers/country_language.rb +++ b/app/models/content_groupers/country_language.rb @@ -1,4 +1,4 @@ -class CountryLanguage < ActiveRecord +class CountryLanguage < ApplicationRecord belongs_to :user belongs_to :country belongs_to :language diff --git a/app/models/content_groupers/country_location.rb b/app/models/content_groupers/country_location.rb index 1440bca7..45aac7cd 100644 --- a/app/models/content_groupers/country_location.rb +++ b/app/models/content_groupers/country_location.rb @@ -1,4 +1,4 @@ -class CountryLocation < ActiveRecord +class CountryLocation < ApplicationRecord belongs_to :user belongs_to :country belongs_to :location diff --git a/app/models/content_groupers/country_religion.rb b/app/models/content_groupers/country_religion.rb index d26a95c6..af985484 100644 --- a/app/models/content_groupers/country_religion.rb +++ b/app/models/content_groupers/country_religion.rb @@ -1,4 +1,4 @@ -class CountryReligion < ActiveRecord +class CountryReligion < ApplicationRecord belongs_to :user belongs_to :country belongs_to :religion diff --git a/app/models/content_groupers/country_town.rb b/app/models/content_groupers/country_town.rb index 4f5a18d6..992a1ae9 100644 --- a/app/models/content_groupers/country_town.rb +++ b/app/models/content_groupers/country_town.rb @@ -1,4 +1,4 @@ -class CountryTown < ActiveRecord +class CountryTown < ApplicationRecord belongs_to :user belongs_to :country belongs_to :town diff --git a/app/models/content_groupers/creature_relationship.rb b/app/models/content_groupers/creature_relationship.rb index fa738089..83ebcc2f 100644 --- a/app/models/content_groupers/creature_relationship.rb +++ b/app/models/content_groupers/creature_relationship.rb @@ -1,4 +1,4 @@ -class CreatureRelationship < ActiveRecord +class CreatureRelationship < ApplicationRecord include HasContentLinking LINK_TYPE = :two_way diff --git a/app/models/content_groupers/current_ownership.rb b/app/models/content_groupers/current_ownership.rb index b02061fd..5c408db3 100644 --- a/app/models/content_groupers/current_ownership.rb +++ b/app/models/content_groupers/current_ownership.rb @@ -1,6 +1,6 @@ # Defines a relation from an Item to the Character that currently owns it # and an inverse relationship from a Character to all items it currently owns -class CurrentOwnership < ActiveRecord +class CurrentOwnership < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/deity_ability.rb b/app/models/content_groupers/deity_ability.rb index ede39767..2c21f249 100644 --- a/app/models/content_groupers/deity_ability.rb +++ b/app/models/content_groupers/deity_ability.rb @@ -1,4 +1,4 @@ -class DeityAbility < ActiveRecord +class DeityAbility < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :ability, class_name: Magic.name diff --git a/app/models/content_groupers/deity_character_child.rb b/app/models/content_groupers/deity_character_child.rb index 4ea793db..761822ad 100644 --- a/app/models/content_groupers/deity_character_child.rb +++ b/app/models/content_groupers/deity_character_child.rb @@ -1,4 +1,4 @@ -class DeityCharacterChild < ActiveRecord +class DeityCharacterChild < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :character_child, class_name: Character.name diff --git a/app/models/content_groupers/deity_character_parent.rb b/app/models/content_groupers/deity_character_parent.rb index 96cd99a5..2f5fb053 100644 --- a/app/models/content_groupers/deity_character_parent.rb +++ b/app/models/content_groupers/deity_character_parent.rb @@ -1,4 +1,4 @@ -class DeityCharacterParent < ActiveRecord +class DeityCharacterParent < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :character_parent, class_name: Character.name diff --git a/app/models/content_groupers/deity_character_partner.rb b/app/models/content_groupers/deity_character_partner.rb index 6f37f897..27542e5c 100644 --- a/app/models/content_groupers/deity_character_partner.rb +++ b/app/models/content_groupers/deity_character_partner.rb @@ -1,4 +1,4 @@ -class DeityCharacterPartner < ActiveRecord +class DeityCharacterPartner < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :character_partner, class_name: Character.name diff --git a/app/models/content_groupers/deity_character_sibling.rb b/app/models/content_groupers/deity_character_sibling.rb index 5c2b159c..e2a494a1 100644 --- a/app/models/content_groupers/deity_character_sibling.rb +++ b/app/models/content_groupers/deity_character_sibling.rb @@ -1,4 +1,4 @@ -class DeityCharacterSibling < ActiveRecord +class DeityCharacterSibling < ApplicationRecord include HasContentLinking belongs_to :deity diff --git a/app/models/content_groupers/deity_creature.rb b/app/models/content_groupers/deity_creature.rb index 72891e30..198931bd 100644 --- a/app/models/content_groupers/deity_creature.rb +++ b/app/models/content_groupers/deity_creature.rb @@ -1,4 +1,4 @@ -class DeityCreature < ActiveRecord +class DeityCreature < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :creature diff --git a/app/models/content_groupers/deity_deity_child.rb b/app/models/content_groupers/deity_deity_child.rb index e1f4b6db..a1fdb7f0 100644 --- a/app/models/content_groupers/deity_deity_child.rb +++ b/app/models/content_groupers/deity_deity_child.rb @@ -1,4 +1,4 @@ -class DeityDeityChild < ActiveRecord +class DeityDeityChild < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :deity_child, class_name: Deity.name diff --git a/app/models/content_groupers/deity_deity_parent.rb b/app/models/content_groupers/deity_deity_parent.rb index ab91120f..a71a9769 100644 --- a/app/models/content_groupers/deity_deity_parent.rb +++ b/app/models/content_groupers/deity_deity_parent.rb @@ -1,4 +1,4 @@ -class DeityDeityParent < ActiveRecord +class DeityDeityParent < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :deity_parent, class_name: Deity.name diff --git a/app/models/content_groupers/deity_deity_partner.rb b/app/models/content_groupers/deity_deity_partner.rb index e400ff5e..fa980ad1 100644 --- a/app/models/content_groupers/deity_deity_partner.rb +++ b/app/models/content_groupers/deity_deity_partner.rb @@ -1,4 +1,4 @@ -class DeityDeityPartner < ActiveRecord +class DeityDeityPartner < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :deity_partner, class_name: Deity.name diff --git a/app/models/content_groupers/deity_deity_sibling.rb b/app/models/content_groupers/deity_deity_sibling.rb index 7914eb1c..69cd6de5 100644 --- a/app/models/content_groupers/deity_deity_sibling.rb +++ b/app/models/content_groupers/deity_deity_sibling.rb @@ -1,4 +1,4 @@ -class DeityDeitySibling < ActiveRecord +class DeityDeitySibling < ApplicationRecord include HasContentLinking belongs_to :deity diff --git a/app/models/content_groupers/deity_flora.rb b/app/models/content_groupers/deity_flora.rb index 8be1750b..59428154 100644 --- a/app/models/content_groupers/deity_flora.rb +++ b/app/models/content_groupers/deity_flora.rb @@ -1,4 +1,4 @@ -class DeityFlora < ActiveRecord +class DeityFlora < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :flora diff --git a/app/models/content_groupers/deity_race.rb b/app/models/content_groupers/deity_race.rb index 43a7921b..9bdfcf9a 100644 --- a/app/models/content_groupers/deity_race.rb +++ b/app/models/content_groupers/deity_race.rb @@ -1,4 +1,4 @@ -class DeityRace < ActiveRecord +class DeityRace < ApplicationRecord belongs_to :deity belongs_to :race belongs_to :user diff --git a/app/models/content_groupers/deity_related_landmark.rb b/app/models/content_groupers/deity_related_landmark.rb index 4b17646d..58f323d2 100644 --- a/app/models/content_groupers/deity_related_landmark.rb +++ b/app/models/content_groupers/deity_related_landmark.rb @@ -1,4 +1,4 @@ -class DeityRelatedLandmark < ActiveRecord +class DeityRelatedLandmark < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :related_landmark, class_name: Landmark.name diff --git a/app/models/content_groupers/deity_related_town.rb b/app/models/content_groupers/deity_related_town.rb index 56412377..75f5d991 100644 --- a/app/models/content_groupers/deity_related_town.rb +++ b/app/models/content_groupers/deity_related_town.rb @@ -1,4 +1,4 @@ -class DeityRelatedTown < ActiveRecord +class DeityRelatedTown < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :related_town, class_name: Town.name diff --git a/app/models/content_groupers/deity_relic.rb b/app/models/content_groupers/deity_relic.rb index 83273b38..43694ed2 100644 --- a/app/models/content_groupers/deity_relic.rb +++ b/app/models/content_groupers/deity_relic.rb @@ -1,4 +1,4 @@ -class DeityRelic < ActiveRecord +class DeityRelic < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :relic, class_name: Item.name diff --git a/app/models/content_groupers/deity_religion.rb b/app/models/content_groupers/deity_religion.rb index 0bfc0d5e..6a7fb0df 100644 --- a/app/models/content_groupers/deity_religion.rb +++ b/app/models/content_groupers/deity_religion.rb @@ -1,4 +1,4 @@ -class DeityReligion < ActiveRecord +class DeityReligion < ApplicationRecord belongs_to :user belongs_to :deity belongs_to :religion diff --git a/app/models/content_groupers/deityship.rb b/app/models/content_groupers/deityship.rb index 1f34d868..10a0a5df 100644 --- a/app/models/content_groupers/deityship.rb +++ b/app/models/content_groupers/deityship.rb @@ -1,4 +1,4 @@ -class Deityship < ActiveRecord +class Deityship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/famous_figureship.rb b/app/models/content_groupers/famous_figureship.rb index 6c863156..04487218 100644 --- a/app/models/content_groupers/famous_figureship.rb +++ b/app/models/content_groupers/famous_figureship.rb @@ -1,4 +1,4 @@ -class FamousFigureship < ActiveRecord +class FamousFigureship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/fathership.rb b/app/models/content_groupers/fathership.rb index 2fc3684e..6b07fffe 100644 --- a/app/models/content_groupers/fathership.rb +++ b/app/models/content_groupers/fathership.rb @@ -1,4 +1,4 @@ -class Fathership < ActiveRecord +class Fathership < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/flora_eaten_by.rb b/app/models/content_groupers/flora_eaten_by.rb index cce2882f..2d8a3847 100644 --- a/app/models/content_groupers/flora_eaten_by.rb +++ b/app/models/content_groupers/flora_eaten_by.rb @@ -1,4 +1,4 @@ -class FloraEatenBy < ActiveRecord +class FloraEatenBy < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/flora_location.rb b/app/models/content_groupers/flora_location.rb index 923f59b2..2200f749 100644 --- a/app/models/content_groupers/flora_location.rb +++ b/app/models/content_groupers/flora_location.rb @@ -1,4 +1,4 @@ -class FloraLocation < ActiveRecord +class FloraLocation < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/flora_magical_effect.rb b/app/models/content_groupers/flora_magical_effect.rb index 090dc1b8..5c218716 100644 --- a/app/models/content_groupers/flora_magical_effect.rb +++ b/app/models/content_groupers/flora_magical_effect.rb @@ -1,4 +1,4 @@ -class FloraMagicalEffect < ActiveRecord +class FloraMagicalEffect < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/flora_relationship.rb b/app/models/content_groupers/flora_relationship.rb index 86bde11b..bcbc1151 100644 --- a/app/models/content_groupers/flora_relationship.rb +++ b/app/models/content_groupers/flora_relationship.rb @@ -1,4 +1,4 @@ -class FloraRelationship < ActiveRecord +class FloraRelationship < ApplicationRecord include HasContentLinking LINK_TYPE = :two_way diff --git a/app/models/content_groupers/government_creature.rb b/app/models/content_groupers/government_creature.rb index d95ab80f..131a7261 100644 --- a/app/models/content_groupers/government_creature.rb +++ b/app/models/content_groupers/government_creature.rb @@ -1,4 +1,4 @@ -class GovernmentCreature < ActiveRecord +class GovernmentCreature < ApplicationRecord belongs_to :user belongs_to :government belongs_to :creature diff --git a/app/models/content_groupers/government_group.rb b/app/models/content_groupers/government_group.rb index 9a2e2682..d235b8c3 100644 --- a/app/models/content_groupers/government_group.rb +++ b/app/models/content_groupers/government_group.rb @@ -1,4 +1,4 @@ -class GovernmentGroup < ActiveRecord +class GovernmentGroup < ApplicationRecord belongs_to :user belongs_to :government belongs_to :group diff --git a/app/models/content_groupers/government_item.rb b/app/models/content_groupers/government_item.rb index eacf1d60..d935322a 100644 --- a/app/models/content_groupers/government_item.rb +++ b/app/models/content_groupers/government_item.rb @@ -1,4 +1,4 @@ -class GovernmentItem < ActiveRecord +class GovernmentItem < ApplicationRecord belongs_to :user belongs_to :government belongs_to :item diff --git a/app/models/content_groupers/government_leader.rb b/app/models/content_groupers/government_leader.rb index 715d1a93..f69511ec 100644 --- a/app/models/content_groupers/government_leader.rb +++ b/app/models/content_groupers/government_leader.rb @@ -1,4 +1,4 @@ -class GovernmentLeader < ActiveRecord +class GovernmentLeader < ApplicationRecord belongs_to :user belongs_to :government belongs_to :leader, class_name: Character.name diff --git a/app/models/content_groupers/government_political_figure.rb b/app/models/content_groupers/government_political_figure.rb index f4e63c98..aa5fa10d 100644 --- a/app/models/content_groupers/government_political_figure.rb +++ b/app/models/content_groupers/government_political_figure.rb @@ -1,4 +1,4 @@ -class GovernmentPoliticalFigure < ActiveRecord +class GovernmentPoliticalFigure < ApplicationRecord belongs_to :user belongs_to :government belongs_to :political_figure, class_name: Character.name diff --git a/app/models/content_groupers/government_technology.rb b/app/models/content_groupers/government_technology.rb index 23247d9f..08657168 100644 --- a/app/models/content_groupers/government_technology.rb +++ b/app/models/content_groupers/government_technology.rb @@ -1,4 +1,4 @@ -class GovernmentTechnology < ActiveRecord +class GovernmentTechnology < ApplicationRecord belongs_to :user belongs_to :government belongs_to :technology diff --git a/app/models/content_groupers/group_allyship.rb b/app/models/content_groupers/group_allyship.rb index 3132cac2..e6dc9d68 100644 --- a/app/models/content_groupers/group_allyship.rb +++ b/app/models/content_groupers/group_allyship.rb @@ -1,4 +1,4 @@ -class GroupAllyship < ActiveRecord +class GroupAllyship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/group_clientship.rb b/app/models/content_groupers/group_clientship.rb index c83975c0..ec5e1170 100644 --- a/app/models/content_groupers/group_clientship.rb +++ b/app/models/content_groupers/group_clientship.rb @@ -1,4 +1,4 @@ -class GroupClientship < ActiveRecord +class GroupClientship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/group_creature.rb b/app/models/content_groupers/group_creature.rb index 888f557d..7a1e017e 100644 --- a/app/models/content_groupers/group_creature.rb +++ b/app/models/content_groupers/group_creature.rb @@ -1,4 +1,4 @@ -class GroupCreature < ActiveRecord +class GroupCreature < ApplicationRecord belongs_to :group belongs_to :creature belongs_to :user diff --git a/app/models/content_groupers/group_enemyship.rb b/app/models/content_groupers/group_enemyship.rb index 9ae86cf7..e36369f1 100644 --- a/app/models/content_groupers/group_enemyship.rb +++ b/app/models/content_groupers/group_enemyship.rb @@ -1,4 +1,4 @@ -class GroupEnemyship < ActiveRecord +class GroupEnemyship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/group_equipmentship.rb b/app/models/content_groupers/group_equipmentship.rb index bdbfbd16..59dcd77a 100644 --- a/app/models/content_groupers/group_equipmentship.rb +++ b/app/models/content_groupers/group_equipmentship.rb @@ -1,4 +1,4 @@ -class GroupEquipmentship < ActiveRecord +class GroupEquipmentship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/group_leadership.rb b/app/models/content_groupers/group_leadership.rb index 1030dabb..000b0309 100644 --- a/app/models/content_groupers/group_leadership.rb +++ b/app/models/content_groupers/group_leadership.rb @@ -1,4 +1,4 @@ -class GroupLeadership < ActiveRecord +class GroupLeadership < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/group_locationship.rb b/app/models/content_groupers/group_locationship.rb index 2feb3de0..d5badcd9 100644 --- a/app/models/content_groupers/group_locationship.rb +++ b/app/models/content_groupers/group_locationship.rb @@ -1,4 +1,4 @@ -class GroupLocationship < ActiveRecord +class GroupLocationship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/group_membership.rb b/app/models/content_groupers/group_membership.rb index 82652834..e932f467 100644 --- a/app/models/content_groupers/group_membership.rb +++ b/app/models/content_groupers/group_membership.rb @@ -1,4 +1,4 @@ -class GroupMembership < ActiveRecord +class GroupMembership < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/group_rivalship.rb b/app/models/content_groupers/group_rivalship.rb index 4983deec..f8b7f9dd 100644 --- a/app/models/content_groupers/group_rivalship.rb +++ b/app/models/content_groupers/group_rivalship.rb @@ -1,4 +1,4 @@ -class GroupRivalship < ActiveRecord +class GroupRivalship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/group_suppliership.rb b/app/models/content_groupers/group_suppliership.rb index 7d004f02..e71e77b7 100644 --- a/app/models/content_groupers/group_suppliership.rb +++ b/app/models/content_groupers/group_suppliership.rb @@ -1,4 +1,4 @@ -class GroupSuppliership < ActiveRecord +class GroupSuppliership < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/headquartership.rb b/app/models/content_groupers/headquartership.rb index 2d0b668a..e168c5e2 100644 --- a/app/models/content_groupers/headquartership.rb +++ b/app/models/content_groupers/headquartership.rb @@ -1,4 +1,4 @@ -class Headquartership < ActiveRecord +class Headquartership < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/item_magic.rb b/app/models/content_groupers/item_magic.rb index a56953d1..e7fefc4f 100644 --- a/app/models/content_groupers/item_magic.rb +++ b/app/models/content_groupers/item_magic.rb @@ -1,4 +1,4 @@ -class ItemMagic < ActiveRecord +class ItemMagic < ApplicationRecord belongs_to :item belongs_to :magic belongs_to :user diff --git a/app/models/content_groupers/key_itemship.rb b/app/models/content_groupers/key_itemship.rb index 80465797..7175922f 100644 --- a/app/models/content_groupers/key_itemship.rb +++ b/app/models/content_groupers/key_itemship.rb @@ -1,4 +1,4 @@ -class KeyItemship < ActiveRecord +class KeyItemship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/landmark_country.rb b/app/models/content_groupers/landmark_country.rb index 0580fc79..9af5b3c8 100644 --- a/app/models/content_groupers/landmark_country.rb +++ b/app/models/content_groupers/landmark_country.rb @@ -1,4 +1,4 @@ -class LandmarkCountry < ActiveRecord +class LandmarkCountry < ApplicationRecord belongs_to :user belongs_to :landmark belongs_to :country diff --git a/app/models/content_groupers/landmark_creature.rb b/app/models/content_groupers/landmark_creature.rb index c02976ab..faf65b80 100644 --- a/app/models/content_groupers/landmark_creature.rb +++ b/app/models/content_groupers/landmark_creature.rb @@ -1,4 +1,4 @@ -class LandmarkCreature < ActiveRecord +class LandmarkCreature < ApplicationRecord belongs_to :user belongs_to :landmark belongs_to :creature diff --git a/app/models/content_groupers/landmark_flora.rb b/app/models/content_groupers/landmark_flora.rb index 51d5d81c..6da9558e 100644 --- a/app/models/content_groupers/landmark_flora.rb +++ b/app/models/content_groupers/landmark_flora.rb @@ -1,4 +1,4 @@ -class LandmarkFlora < ActiveRecord +class LandmarkFlora < ApplicationRecord belongs_to :user belongs_to :landmark belongs_to :flora diff --git a/app/models/content_groupers/landmark_nearby_town.rb b/app/models/content_groupers/landmark_nearby_town.rb index 68d639f4..cb23903b 100644 --- a/app/models/content_groupers/landmark_nearby_town.rb +++ b/app/models/content_groupers/landmark_nearby_town.rb @@ -1,4 +1,4 @@ -class LandmarkNearbyTown < ActiveRecord +class LandmarkNearbyTown < ApplicationRecord belongs_to :user belongs_to :landmark diff --git a/app/models/content_groupers/largest_cities_relationship.rb b/app/models/content_groupers/largest_cities_relationship.rb index f6032d95..c68e3e5e 100644 --- a/app/models/content_groupers/largest_cities_relationship.rb +++ b/app/models/content_groupers/largest_cities_relationship.rb @@ -1,4 +1,4 @@ -class LargestCitiesRelationship < ActiveRecord +class LargestCitiesRelationship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/lingualism.rb b/app/models/content_groupers/lingualism.rb index 2bf6d322..6ecbdc63 100644 --- a/app/models/content_groupers/lingualism.rb +++ b/app/models/content_groupers/lingualism.rb @@ -1,4 +1,4 @@ -class Lingualism < ActiveRecord +class Lingualism < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/location_capital_town.rb b/app/models/content_groupers/location_capital_town.rb index b8bf84d8..45faae97 100644 --- a/app/models/content_groupers/location_capital_town.rb +++ b/app/models/content_groupers/location_capital_town.rb @@ -1,4 +1,4 @@ -class LocationCapitalTown < ActiveRecord +class LocationCapitalTown < ApplicationRecord belongs_to :location belongs_to :user belongs_to :capital_town, class_name: Town.name diff --git a/app/models/content_groupers/location_landmark.rb b/app/models/content_groupers/location_landmark.rb index 985e32a7..37080508 100644 --- a/app/models/content_groupers/location_landmark.rb +++ b/app/models/content_groupers/location_landmark.rb @@ -1,4 +1,4 @@ -class LocationLandmark < ActiveRecord +class LocationLandmark < ApplicationRecord belongs_to :location belongs_to :landmark belongs_to :user diff --git a/app/models/content_groupers/location_languageship.rb b/app/models/content_groupers/location_languageship.rb index e0278c0a..65750c7d 100644 --- a/app/models/content_groupers/location_languageship.rb +++ b/app/models/content_groupers/location_languageship.rb @@ -1,4 +1,4 @@ -class LocationLanguageship < ActiveRecord +class LocationLanguageship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/location_largest_town.rb b/app/models/content_groupers/location_largest_town.rb index 6460e527..ee48d27d 100644 --- a/app/models/content_groupers/location_largest_town.rb +++ b/app/models/content_groupers/location_largest_town.rb @@ -1,4 +1,4 @@ -class LocationLargestTown < ActiveRecord +class LocationLargestTown < ApplicationRecord belongs_to :location belongs_to :user belongs_to :largest_town, class_name: Town.name diff --git a/app/models/content_groupers/location_leadership.rb b/app/models/content_groupers/location_leadership.rb index 15a7ed96..3da71aa2 100644 --- a/app/models/content_groupers/location_leadership.rb +++ b/app/models/content_groupers/location_leadership.rb @@ -1,4 +1,4 @@ -class LocationLeadership < ActiveRecord +class LocationLeadership < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/location_notable_town.rb b/app/models/content_groupers/location_notable_town.rb index 79cc1638..cecf0815 100644 --- a/app/models/content_groupers/location_notable_town.rb +++ b/app/models/content_groupers/location_notable_town.rb @@ -1,4 +1,4 @@ -class LocationNotableTown < ActiveRecord +class LocationNotableTown < ApplicationRecord belongs_to :location belongs_to :user belongs_to :notable_town, class_name: Town.name diff --git a/app/models/content_groupers/magic_deityship.rb b/app/models/content_groupers/magic_deityship.rb index a1f67f98..e6ef62d9 100644 --- a/app/models/content_groupers/magic_deityship.rb +++ b/app/models/content_groupers/magic_deityship.rb @@ -1,4 +1,4 @@ -class MagicDeityship < ActiveRecord +class MagicDeityship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/maker_relationship.rb b/app/models/content_groupers/maker_relationship.rb index b4f71a3c..582bf8d1 100644 --- a/app/models/content_groupers/maker_relationship.rb +++ b/app/models/content_groupers/maker_relationship.rb @@ -1,6 +1,6 @@ # Defines a relation from an Item to the Character that created it # and an inverse relationship from a Character to all items it created -class MakerRelationship < ActiveRecord +class MakerRelationship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/marriage.rb b/app/models/content_groupers/marriage.rb index 3a6ea0f0..fecdbaa6 100644 --- a/app/models/content_groupers/marriage.rb +++ b/app/models/content_groupers/marriage.rb @@ -1,4 +1,4 @@ -class Marriage < ActiveRecord +class Marriage < ApplicationRecord include HasContentLinking LINK_TYPE = :two_way diff --git a/app/models/content_groupers/mothership.rb b/app/models/content_groupers/mothership.rb index 25774216..74fec4e9 100644 --- a/app/models/content_groupers/mothership.rb +++ b/app/models/content_groupers/mothership.rb @@ -1,4 +1,4 @@ -class Mothership < ActiveRecord +class Mothership < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/notable_cities_relationship.rb b/app/models/content_groupers/notable_cities_relationship.rb index cb8cde4c..c3f16c06 100644 --- a/app/models/content_groupers/notable_cities_relationship.rb +++ b/app/models/content_groupers/notable_cities_relationship.rb @@ -1,6 +1,6 @@ # Defines a relation between a location and any notable cities within it, # and a reverse relation for all locations in which a given location is notable within. -class NotableCitiesRelationship < ActiveRecord +class NotableCitiesRelationship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/officeship.rb b/app/models/content_groupers/officeship.rb index bb0baa09..6395948b 100644 --- a/app/models/content_groupers/officeship.rb +++ b/app/models/content_groupers/officeship.rb @@ -1,4 +1,4 @@ -class Officeship < ActiveRecord +class Officeship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/original_ownership.rb b/app/models/content_groupers/original_ownership.rb index 118da386..46a82fa1 100644 --- a/app/models/content_groupers/original_ownership.rb +++ b/app/models/content_groupers/original_ownership.rb @@ -1,6 +1,6 @@ # Defines a relation from an Item to the Character that first owned it # and an inverse relationship from a Character to all items it first owned -class OriginalOwnership < ActiveRecord +class OriginalOwnership < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/past_ownership.rb b/app/models/content_groupers/past_ownership.rb index 5bb217a8..b7c3dba8 100644 --- a/app/models/content_groupers/past_ownership.rb +++ b/app/models/content_groupers/past_ownership.rb @@ -1,6 +1,6 @@ # Defines a relation from an Item to a Character that previously owned it # and an inverse relationship from an Item to all Characters it has been owned by -class PastOwnership < ActiveRecord +class PastOwnership < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/planet_country.rb b/app/models/content_groupers/planet_country.rb index 47d0732a..b3ea5fac 100644 --- a/app/models/content_groupers/planet_country.rb +++ b/app/models/content_groupers/planet_country.rb @@ -1,4 +1,4 @@ -class PlanetCountry < ActiveRecord +class PlanetCountry < ApplicationRecord belongs_to :user belongs_to :planet belongs_to :country diff --git a/app/models/content_groupers/planet_creature.rb b/app/models/content_groupers/planet_creature.rb index cec60cbd..16e8c9fa 100644 --- a/app/models/content_groupers/planet_creature.rb +++ b/app/models/content_groupers/planet_creature.rb @@ -1,4 +1,4 @@ -class PlanetCreature < ActiveRecord +class PlanetCreature < ApplicationRecord belongs_to :user belongs_to :planet belongs_to :creature diff --git a/app/models/content_groupers/planet_deity.rb b/app/models/content_groupers/planet_deity.rb index 03969c4f..8e92b3dd 100644 --- a/app/models/content_groupers/planet_deity.rb +++ b/app/models/content_groupers/planet_deity.rb @@ -1,4 +1,4 @@ -class PlanetDeity < ActiveRecord +class PlanetDeity < ApplicationRecord belongs_to :user belongs_to :planet belongs_to :deity diff --git a/app/models/content_groupers/planet_flora.rb b/app/models/content_groupers/planet_flora.rb index e0abb2cf..dd29d1e1 100644 --- a/app/models/content_groupers/planet_flora.rb +++ b/app/models/content_groupers/planet_flora.rb @@ -1,4 +1,4 @@ -class PlanetFlora < ActiveRecord +class PlanetFlora < ApplicationRecord belongs_to :user belongs_to :planet belongs_to :flora diff --git a/app/models/content_groupers/planet_group.rb b/app/models/content_groupers/planet_group.rb index 302a6d42..83eed0d9 100644 --- a/app/models/content_groupers/planet_group.rb +++ b/app/models/content_groupers/planet_group.rb @@ -1,4 +1,4 @@ -class PlanetGroup < ActiveRecord +class PlanetGroup < ApplicationRecord belongs_to :user belongs_to :planet belongs_to :group diff --git a/app/models/content_groupers/planet_landmark.rb b/app/models/content_groupers/planet_landmark.rb index b64574a3..9f19d313 100644 --- a/app/models/content_groupers/planet_landmark.rb +++ b/app/models/content_groupers/planet_landmark.rb @@ -1,4 +1,4 @@ -class PlanetLandmark < ActiveRecord +class PlanetLandmark < ApplicationRecord belongs_to :user belongs_to :planet belongs_to :landmark diff --git a/app/models/content_groupers/planet_language.rb b/app/models/content_groupers/planet_language.rb index 82f06cdc..77ae5d77 100644 --- a/app/models/content_groupers/planet_language.rb +++ b/app/models/content_groupers/planet_language.rb @@ -1,4 +1,4 @@ -class PlanetLanguage < ActiveRecord +class PlanetLanguage < ApplicationRecord belongs_to :user belongs_to :planet belongs_to :language diff --git a/app/models/content_groupers/planet_location.rb b/app/models/content_groupers/planet_location.rb index f7440160..4f5df3ac 100644 --- a/app/models/content_groupers/planet_location.rb +++ b/app/models/content_groupers/planet_location.rb @@ -1,4 +1,4 @@ -class PlanetLocation < ActiveRecord +class PlanetLocation < ApplicationRecord belongs_to :user belongs_to :planet belongs_to :location diff --git a/app/models/content_groupers/planet_nearby_planet.rb b/app/models/content_groupers/planet_nearby_planet.rb index f9483312..1e87c36e 100644 --- a/app/models/content_groupers/planet_nearby_planet.rb +++ b/app/models/content_groupers/planet_nearby_planet.rb @@ -1,4 +1,4 @@ -class PlanetNearbyPlanet < ActiveRecord +class PlanetNearbyPlanet < ApplicationRecord include HasContentLinking LINK_TYPE = :two_way diff --git a/app/models/content_groupers/planet_race.rb b/app/models/content_groupers/planet_race.rb index e0c28754..540121a5 100644 --- a/app/models/content_groupers/planet_race.rb +++ b/app/models/content_groupers/planet_race.rb @@ -1,4 +1,4 @@ -class PlanetRace < ActiveRecord +class PlanetRace < ApplicationRecord belongs_to :user belongs_to :planet belongs_to :race diff --git a/app/models/content_groupers/planet_religion.rb b/app/models/content_groupers/planet_religion.rb index 35d1f0c0..b9016fbf 100644 --- a/app/models/content_groupers/planet_religion.rb +++ b/app/models/content_groupers/planet_religion.rb @@ -1,4 +1,4 @@ -class PlanetReligion < ActiveRecord +class PlanetReligion < ApplicationRecord belongs_to :user belongs_to :planet belongs_to :religion diff --git a/app/models/content_groupers/planet_town.rb b/app/models/content_groupers/planet_town.rb index d68984cf..a8660036 100644 --- a/app/models/content_groupers/planet_town.rb +++ b/app/models/content_groupers/planet_town.rb @@ -1,4 +1,4 @@ -class PlanetTown < ActiveRecord +class PlanetTown < ApplicationRecord belongs_to :user belongs_to :planet belongs_to :town diff --git a/app/models/content_groupers/raceship.rb b/app/models/content_groupers/raceship.rb index 335828e4..1451c744 100644 --- a/app/models/content_groupers/raceship.rb +++ b/app/models/content_groupers/raceship.rb @@ -1,4 +1,4 @@ -class Raceship < ActiveRecord +class Raceship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/religious_figureship.rb b/app/models/content_groupers/religious_figureship.rb index b00c5157..73443a1f 100644 --- a/app/models/content_groupers/religious_figureship.rb +++ b/app/models/content_groupers/religious_figureship.rb @@ -1,4 +1,4 @@ -class ReligiousFigureship < ActiveRecord +class ReligiousFigureship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/religious_locationship.rb b/app/models/content_groupers/religious_locationship.rb index aee569f3..8122b00a 100644 --- a/app/models/content_groupers/religious_locationship.rb +++ b/app/models/content_groupers/religious_locationship.rb @@ -1,4 +1,4 @@ -class ReligiousLocationship < ActiveRecord +class ReligiousLocationship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/religious_raceship.rb b/app/models/content_groupers/religious_raceship.rb index e0e64567..d96d7476 100644 --- a/app/models/content_groupers/religious_raceship.rb +++ b/app/models/content_groupers/religious_raceship.rb @@ -1,4 +1,4 @@ -class ReligiousRaceship < ActiveRecord +class ReligiousRaceship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/scene_charactership.rb b/app/models/content_groupers/scene_charactership.rb index 9d793b70..f3cdfa33 100644 --- a/app/models/content_groupers/scene_charactership.rb +++ b/app/models/content_groupers/scene_charactership.rb @@ -1,4 +1,4 @@ -class SceneCharactership < ActiveRecord +class SceneCharactership < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/scene_itemship.rb b/app/models/content_groupers/scene_itemship.rb index e775af27..2d0ec314 100644 --- a/app/models/content_groupers/scene_itemship.rb +++ b/app/models/content_groupers/scene_itemship.rb @@ -1,4 +1,4 @@ -class SceneItemship < ActiveRecord +class SceneItemship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/scene_locationship.rb b/app/models/content_groupers/scene_locationship.rb index bcdcd1da..4a61abb7 100644 --- a/app/models/content_groupers/scene_locationship.rb +++ b/app/models/content_groupers/scene_locationship.rb @@ -1,4 +1,4 @@ -class SceneLocationship < ActiveRecord +class SceneLocationship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/siblingship.rb b/app/models/content_groupers/siblingship.rb index 79a3f1d7..1d888270 100644 --- a/app/models/content_groupers/siblingship.rb +++ b/app/models/content_groupers/siblingship.rb @@ -1,4 +1,4 @@ -class Siblingship < ActiveRecord +class Siblingship < ApplicationRecord include HasContentLinking LINK_TYPE = :two_way diff --git a/app/models/content_groupers/sistergroupship.rb b/app/models/content_groupers/sistergroupship.rb index becb1bc0..629a62f8 100644 --- a/app/models/content_groupers/sistergroupship.rb +++ b/app/models/content_groupers/sistergroupship.rb @@ -1,4 +1,4 @@ -class Sistergroupship < ActiveRecord +class Sistergroupship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/subgroupship.rb b/app/models/content_groupers/subgroupship.rb index aff38a0c..66526b77 100644 --- a/app/models/content_groupers/subgroupship.rb +++ b/app/models/content_groupers/subgroupship.rb @@ -1,4 +1,4 @@ -class Subgroupship < ActiveRecord +class Subgroupship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/supergroupship.rb b/app/models/content_groupers/supergroupship.rb index 3149b45e..cfe0a1e9 100644 --- a/app/models/content_groupers/supergroupship.rb +++ b/app/models/content_groupers/supergroupship.rb @@ -1,4 +1,4 @@ -class Supergroupship < ActiveRecord +class Supergroupship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/technology_character.rb b/app/models/content_groupers/technology_character.rb index 553c65d2..46b2fdac 100644 --- a/app/models/content_groupers/technology_character.rb +++ b/app/models/content_groupers/technology_character.rb @@ -1,4 +1,4 @@ -class TechnologyCharacter < ActiveRecord +class TechnologyCharacter < ApplicationRecord belongs_to :user belongs_to :technology belongs_to :character diff --git a/app/models/content_groupers/technology_child_technology.rb b/app/models/content_groupers/technology_child_technology.rb index 548e27fe..2751d75e 100644 --- a/app/models/content_groupers/technology_child_technology.rb +++ b/app/models/content_groupers/technology_child_technology.rb @@ -1,4 +1,4 @@ -class TechnologyChildTechnology < ActiveRecord +class TechnologyChildTechnology < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/technology_country.rb b/app/models/content_groupers/technology_country.rb index dd296b9f..768a0cd8 100644 --- a/app/models/content_groupers/technology_country.rb +++ b/app/models/content_groupers/technology_country.rb @@ -1,4 +1,4 @@ -class TechnologyCountry < ActiveRecord +class TechnologyCountry < ApplicationRecord belongs_to :user belongs_to :technology belongs_to :country diff --git a/app/models/content_groupers/technology_creature.rb b/app/models/content_groupers/technology_creature.rb index 543e1c78..294461b3 100644 --- a/app/models/content_groupers/technology_creature.rb +++ b/app/models/content_groupers/technology_creature.rb @@ -1,4 +1,4 @@ -class TechnologyCreature < ActiveRecord +class TechnologyCreature < ApplicationRecord belongs_to :user belongs_to :technology belongs_to :creature diff --git a/app/models/content_groupers/technology_group.rb b/app/models/content_groupers/technology_group.rb index b0151d24..b241e672 100644 --- a/app/models/content_groupers/technology_group.rb +++ b/app/models/content_groupers/technology_group.rb @@ -1,4 +1,4 @@ -class TechnologyGroup < ActiveRecord +class TechnologyGroup < ApplicationRecord belongs_to :user belongs_to :technology belongs_to :group diff --git a/app/models/content_groupers/technology_magic.rb b/app/models/content_groupers/technology_magic.rb index db368529..3766c757 100644 --- a/app/models/content_groupers/technology_magic.rb +++ b/app/models/content_groupers/technology_magic.rb @@ -1,4 +1,4 @@ -class TechnologyMagic < ActiveRecord +class TechnologyMagic < ApplicationRecord belongs_to :user belongs_to :technology belongs_to :magic diff --git a/app/models/content_groupers/technology_parent_technology.rb b/app/models/content_groupers/technology_parent_technology.rb index 21820df2..eb168c27 100644 --- a/app/models/content_groupers/technology_parent_technology.rb +++ b/app/models/content_groupers/technology_parent_technology.rb @@ -1,4 +1,4 @@ -class TechnologyParentTechnology < ActiveRecord +class TechnologyParentTechnology < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/technology_planet.rb b/app/models/content_groupers/technology_planet.rb index f0f00a50..56756e74 100644 --- a/app/models/content_groupers/technology_planet.rb +++ b/app/models/content_groupers/technology_planet.rb @@ -1,4 +1,4 @@ -class TechnologyPlanet < ActiveRecord +class TechnologyPlanet < ApplicationRecord belongs_to :user belongs_to :technology belongs_to :planet diff --git a/app/models/content_groupers/technology_related_technology.rb b/app/models/content_groupers/technology_related_technology.rb index 993a7d14..98564b6e 100644 --- a/app/models/content_groupers/technology_related_technology.rb +++ b/app/models/content_groupers/technology_related_technology.rb @@ -1,4 +1,4 @@ -class TechnologyRelatedTechnology < ActiveRecord +class TechnologyRelatedTechnology < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_groupers/technology_town.rb b/app/models/content_groupers/technology_town.rb index 9b5f4f7a..e1b1bd90 100644 --- a/app/models/content_groupers/technology_town.rb +++ b/app/models/content_groupers/technology_town.rb @@ -1,4 +1,4 @@ -class TechnologyTown < ActiveRecord +class TechnologyTown < ApplicationRecord belongs_to :user belongs_to :technology belongs_to :town diff --git a/app/models/content_groupers/town_citizen.rb b/app/models/content_groupers/town_citizen.rb index 79b1eb0d..97450ded 100644 --- a/app/models/content_groupers/town_citizen.rb +++ b/app/models/content_groupers/town_citizen.rb @@ -1,4 +1,4 @@ -class TownCitizen < ActiveRecord +class TownCitizen < ApplicationRecord belongs_to :user belongs_to :town belongs_to :citizen, class_name: 'Character' diff --git a/app/models/content_groupers/town_country.rb b/app/models/content_groupers/town_country.rb index 7ad211bd..0b098f73 100644 --- a/app/models/content_groupers/town_country.rb +++ b/app/models/content_groupers/town_country.rb @@ -1,4 +1,4 @@ -class TownCountry < ActiveRecord +class TownCountry < ApplicationRecord belongs_to :user belongs_to :town belongs_to :country diff --git a/app/models/content_groupers/town_creature.rb b/app/models/content_groupers/town_creature.rb index cd05746c..aa573e17 100644 --- a/app/models/content_groupers/town_creature.rb +++ b/app/models/content_groupers/town_creature.rb @@ -1,4 +1,4 @@ -class TownCreature < ActiveRecord +class TownCreature < ApplicationRecord belongs_to :user belongs_to :town belongs_to :creature diff --git a/app/models/content_groupers/town_flora.rb b/app/models/content_groupers/town_flora.rb index 2cfb6102..e8e54cee 100644 --- a/app/models/content_groupers/town_flora.rb +++ b/app/models/content_groupers/town_flora.rb @@ -1,4 +1,4 @@ -class TownFlora < ActiveRecord +class TownFlora < ApplicationRecord belongs_to :user belongs_to :town belongs_to :flora diff --git a/app/models/content_groupers/town_group.rb b/app/models/content_groupers/town_group.rb index d2f7a545..7237f73e 100644 --- a/app/models/content_groupers/town_group.rb +++ b/app/models/content_groupers/town_group.rb @@ -1,4 +1,4 @@ -class TownGroup < ActiveRecord +class TownGroup < ApplicationRecord belongs_to :user belongs_to :town belongs_to :group diff --git a/app/models/content_groupers/town_language.rb b/app/models/content_groupers/town_language.rb index 7da4d92c..325d842b 100644 --- a/app/models/content_groupers/town_language.rb +++ b/app/models/content_groupers/town_language.rb @@ -1,4 +1,4 @@ -class TownLanguage < ActiveRecord +class TownLanguage < ApplicationRecord belongs_to :user belongs_to :town belongs_to :language diff --git a/app/models/content_groupers/town_nearby_landmark.rb b/app/models/content_groupers/town_nearby_landmark.rb index 13964e83..ac109257 100644 --- a/app/models/content_groupers/town_nearby_landmark.rb +++ b/app/models/content_groupers/town_nearby_landmark.rb @@ -1,4 +1,4 @@ -class TownNearbyLandmark < ActiveRecord +class TownNearbyLandmark < ApplicationRecord belongs_to :user belongs_to :town belongs_to :nearby_landmark, class_name: 'Landmark' diff --git a/app/models/content_groupers/wildlifeship.rb b/app/models/content_groupers/wildlifeship.rb index f5081450..ea23f72c 100644 --- a/app/models/content_groupers/wildlifeship.rb +++ b/app/models/content_groupers/wildlifeship.rb @@ -1,4 +1,4 @@ -class Wildlifeship < ActiveRecord +class Wildlifeship < ApplicationRecord include HasContentLinking belongs_to :user diff --git a/app/models/content_types/character.rb b/app/models/content_types/character.rb index ad782b6d..2c16dcbc 100644 --- a/app/models/content_types/character.rb +++ b/app/models/content_types/character.rb @@ -6,7 +6,7 @@ # 1. a person in a User's story. # # exists within a Universe. -class Character < ActiveRecord +class Character < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/country.rb b/app/models/content_types/country.rb index e7ba5e4f..ae711760 100644 --- a/app/models/content_types/country.rb +++ b/app/models/content_types/country.rb @@ -1,4 +1,4 @@ -class Country < ActiveRecord +class Country < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/creature.rb b/app/models/content_types/creature.rb index 25b0717c..eb66c424 100644 --- a/app/models/content_types/creature.rb +++ b/app/models/content_types/creature.rb @@ -6,7 +6,7 @@ # 1. an animal, plant, or other wildlife occuring in a user's story # # exists within a Universe. -class Creature < ActiveRecord +class Creature < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/deity.rb b/app/models/content_types/deity.rb index bee8e5e2..0ab82e0f 100644 --- a/app/models/content_types/deity.rb +++ b/app/models/content_types/deity.rb @@ -1,4 +1,4 @@ -class Deity < ActiveRecord +class Deity < ApplicationRecord acts_as_paranoid belongs_to :user diff --git a/app/models/content_types/flora.rb b/app/models/content_types/flora.rb index 738d01a9..c468b828 100644 --- a/app/models/content_types/flora.rb +++ b/app/models/content_types/flora.rb @@ -1,4 +1,4 @@ -class Flora < ActiveRecord +class Flora < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/government.rb b/app/models/content_types/government.rb index 28bf9ce4..68380241 100644 --- a/app/models/content_types/government.rb +++ b/app/models/content_types/government.rb @@ -1,4 +1,4 @@ -class Government < ActiveRecord +class Government < ApplicationRecord acts_as_paranoid belongs_to :user diff --git a/app/models/content_types/group.rb b/app/models/content_types/group.rb index c17587e8..d719550e 100644 --- a/app/models/content_types/group.rb +++ b/app/models/content_types/group.rb @@ -1,4 +1,4 @@ -class Group < ActiveRecord +class Group < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/item.rb b/app/models/content_types/item.rb index cbd64eef..0111f8cc 100644 --- a/app/models/content_types/item.rb +++ b/app/models/content_types/item.rb @@ -6,7 +6,7 @@ # 1. the necessary items for a particular purpose. # # exists within a Universe. -class Item < ActiveRecord +class Item < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/landmark.rb b/app/models/content_types/landmark.rb index 0b120a7a..4b4e222d 100644 --- a/app/models/content_types/landmark.rb +++ b/app/models/content_types/landmark.rb @@ -1,4 +1,4 @@ -class Landmark < ActiveRecord +class Landmark < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/language.rb b/app/models/content_types/language.rb index c8a4e9de..e38ae189 100644 --- a/app/models/content_types/language.rb +++ b/app/models/content_types/language.rb @@ -1,4 +1,4 @@ -class Language < ActiveRecord +class Language < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/location.rb b/app/models/content_types/location.rb index 181e0193..3b41ddcf 100644 --- a/app/models/content_types/location.rb +++ b/app/models/content_types/location.rb @@ -6,7 +6,7 @@ # 1. a particular place or position # # exists within a Universe -class Location < ActiveRecord +class Location < ApplicationRecord acts_as_paranoid # todo: clear these -- not used anymore diff --git a/app/models/content_types/magic.rb b/app/models/content_types/magic.rb index a6ca84c9..35a28a4a 100644 --- a/app/models/content_types/magic.rb +++ b/app/models/content_types/magic.rb @@ -1,4 +1,4 @@ -class Magic < ActiveRecord +class Magic < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/planet.rb b/app/models/content_types/planet.rb index c9750007..7b2e5b39 100644 --- a/app/models/content_types/planet.rb +++ b/app/models/content_types/planet.rb @@ -1,4 +1,4 @@ -class Planet < ActiveRecord +class Planet < ApplicationRecord acts_as_paranoid belongs_to :user diff --git a/app/models/content_types/race.rb b/app/models/content_types/race.rb index 23834697..1335e3c4 100644 --- a/app/models/content_types/race.rb +++ b/app/models/content_types/race.rb @@ -4,7 +4,7 @@ # _noun_ # # 1. each of the major divisions of sentient life, having distinct physical characteristics -class Race < ActiveRecord +class Race < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/religion.rb b/app/models/content_types/religion.rb index f0292c95..47d7b12b 100644 --- a/app/models/content_types/religion.rb +++ b/app/models/content_types/religion.rb @@ -1,4 +1,4 @@ -class Religion < ActiveRecord +class Religion < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/scene.rb b/app/models/content_types/scene.rb index e3137e7d..1a199d52 100644 --- a/app/models/content_types/scene.rb +++ b/app/models/content_types/scene.rb @@ -1,4 +1,4 @@ -class Scene < ActiveRecord +class Scene < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/technology.rb b/app/models/content_types/technology.rb index 48d26d21..e68b5402 100644 --- a/app/models/content_types/technology.rb +++ b/app/models/content_types/technology.rb @@ -1,4 +1,4 @@ -class Technology < ActiveRecord +class Technology < ApplicationRecord acts_as_paranoid belongs_to :user diff --git a/app/models/content_types/town.rb b/app/models/content_types/town.rb index 2e7c8544..665f3629 100644 --- a/app/models/content_types/town.rb +++ b/app/models/content_types/town.rb @@ -1,4 +1,4 @@ -class Town < ActiveRecord +class Town < ApplicationRecord acts_as_paranoid validates :name, presence: true diff --git a/app/models/content_types/universe.rb b/app/models/content_types/universe.rb index 3c154b2d..23d19aee 100644 --- a/app/models/content_types/universe.rb +++ b/app/models/content_types/universe.rb @@ -5,7 +5,7 @@ # 1. a particular sphere of activity, interest, or experience # # contains all canonically-related content created by Users -class Universe < ActiveRecord +class Universe < ApplicationRecord acts_as_paranoid include HasAttributes diff --git a/app/models/contributor.rb b/app/models/contributor.rb index e2fb0414..7a65754f 100644 --- a/app/models/contributor.rb +++ b/app/models/contributor.rb @@ -1,4 +1,4 @@ -class Contributor < ActiveRecord +class Contributor < ApplicationRecord belongs_to :universe belongs_to :user end diff --git a/app/models/document.rb b/app/models/document.rb index 51fd7782..5460290a 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -1,3 +1,3 @@ -class Document < ActiveRecord +class Document < ApplicationRecord belongs_to :user end diff --git a/app/models/image_upload.rb b/app/models/image_upload.rb index 2273e2a5..d9676e25 100644 --- a/app/models/image_upload.rb +++ b/app/models/image_upload.rb @@ -1,4 +1,4 @@ -class ImageUpload < ActiveRecord +class ImageUpload < ApplicationRecord belongs_to :user has_attached_file :src, diff --git a/app/models/raffle_entry.rb b/app/models/raffle_entry.rb index 51fe76da..82f89839 100644 --- a/app/models/raffle_entry.rb +++ b/app/models/raffle_entry.rb @@ -1,3 +1,3 @@ -class RaffleEntry < ActiveRecord +class RaffleEntry < ApplicationRecord belongs_to :user end diff --git a/app/models/referral.rb b/app/models/referral.rb index e931c06e..42a39084 100644 --- a/app/models/referral.rb +++ b/app/models/referral.rb @@ -1,4 +1,4 @@ -class Referral < ActiveRecord +class Referral < ApplicationRecord def referrer User.find_by(id: self.referrer_id) end diff --git a/app/models/referral_code.rb b/app/models/referral_code.rb index bb55d373..5f36629b 100644 --- a/app/models/referral_code.rb +++ b/app/models/referral_code.rb @@ -1,3 +1,3 @@ -class ReferralCode < ActiveRecord +class ReferralCode < ApplicationRecord belongs_to :user end diff --git a/app/models/stripe_event_log.rb b/app/models/stripe_event_log.rb index cc47fc66..1183aeac 100644 --- a/app/models/stripe_event_log.rb +++ b/app/models/stripe_event_log.rb @@ -1,2 +1,2 @@ -class StripeEventLog < ActiveRecord +class StripeEventLog < ApplicationRecord end diff --git a/app/models/subscription.rb b/app/models/subscription.rb index 4f6f2163..73ee991d 100644 --- a/app/models/subscription.rb +++ b/app/models/subscription.rb @@ -1,4 +1,4 @@ -class Subscription < ActiveRecord +class Subscription < ApplicationRecord belongs_to :user belongs_to :billing_plan end diff --git a/app/models/user.rb b/app/models/user.rb index 44bd52aa..69aec707 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,7 +2,7 @@ require 'digest/md5' ## # a person using the Notebook.ai web application. Owns all other content. -class User < ActiveRecord +class User < ApplicationRecord acts_as_paranoid # Include default devise modules. Others available are: diff --git a/app/models/user_content_type_activator.rb b/app/models/user_content_type_activator.rb index e1d1a3df..640cfc18 100644 --- a/app/models/user_content_type_activator.rb +++ b/app/models/user_content_type_activator.rb @@ -1,3 +1,3 @@ -class UserContentTypeActivator < ActiveRecord +class UserContentTypeActivator < ApplicationRecord belongs_to :user end diff --git a/app/models/votable.rb b/app/models/votable.rb index 579ec8bf..e277a0ad 100644 --- a/app/models/votable.rb +++ b/app/models/votable.rb @@ -1,3 +1,3 @@ -class Votable < ActiveRecord +class Votable < ApplicationRecord has_many :votes end diff --git a/app/models/vote.rb b/app/models/vote.rb index ba3a3bc2..dad382a5 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,4 @@ -class Vote < ActiveRecord +class Vote < ApplicationRecord belongs_to :user belongs_to :votable end From 51787a383aa9d4b6468098df782c318fca915036 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 5 Jul 2018 01:24:00 -0500 Subject: [PATCH 09/26] rails 5.2.0 --- Gemfile | 2 +- Gemfile.lock | 124 ++++++++++++++++++++++++++++----------------------- 2 files changed, 69 insertions(+), 57 deletions(-) diff --git a/Gemfile b/Gemfile index 1f2e3808..d74ffd6e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' ruby "~> 2.5" -gem 'rails', '~> 4.2' +gem 'rails', '~> 5.2' gem 'puma', '~> 3.7' gem 'puma-heroku' gem 'rack-timeout' diff --git a/Gemfile.lock b/Gemfile.lock index c9c7b358..8fd1c72a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,45 +7,52 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) + actioncable (5.2.0) + actionpack (= 5.2.0) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.10) - actionview (= 4.2.10) - activesupport (= 4.2.10) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.2.0) + actionview (= 5.2.0) + activesupport (= 5.2.0) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.10) - activesupport (= 4.2.10) + actionview (5.2.0) + activesupport (= 5.2.0) builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (4.2.10) - activesupport (= 4.2.10) - globalid (>= 0.3.0) - activemodel (4.2.10) - activesupport (= 4.2.10) - builder (~> 3.1) - activerecord (4.2.10) - activemodel (= 4.2.10) - activesupport (= 4.2.10) - arel (~> 6.0) - activesupport (4.2.10) - i18n (~> 0.7) + activejob (5.2.0) + activesupport (= 5.2.0) + globalid (>= 0.3.6) + activemodel (5.2.0) + activesupport (= 5.2.0) + activerecord (5.2.0) + activemodel (= 5.2.0) + activesupport (= 5.2.0) + arel (>= 9.0) + activestorage (5.2.0) + actionpack (= 5.2.0) + activerecord (= 5.2.0) + marcel (~> 0.3.1) + activesupport (5.2.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - arel (6.0.4) + arel (9.0.0) ast (2.4.0) authority (3.3.0) activesupport (>= 3.0.0) @@ -159,7 +166,6 @@ GEM diff-lcs (1.3) docile (1.1.5) erubi (1.7.1) - erubis (2.7.0) execjs (2.7.0) factory_bot (4.10.0) activesupport (>= 3.0.0) @@ -200,7 +206,7 @@ GEM htmlentities (4.3.4) httparty (0.16.2) multi_xml (>= 0.5.2) - i18n (0.9.5) + i18n (1.0.1) concurrent-ruby (~> 1.0) inline_svg (1.3.1) activesupport (>= 3.0) @@ -234,6 +240,8 @@ GEM lumberjack (1.0.13) mail (2.7.0) mini_mime (>= 0.1.1) + marcel (0.3.2) + mimemagic (~> 0.3.2) material_icons (2.2.1) railties (>= 3.2) medium-editor-rails (2.3.1) @@ -257,7 +265,8 @@ GEM mustache (1.0.5) nenv (0.3.0) newrelic_rpm (5.2.0.345) - nokogiri (1.8.3) + nio4r (2.3.1) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) nokogumbo (1.5.0) nokogiri @@ -294,27 +303,26 @@ GEM puma (~> 3.0) pundit (1.1.0) activesupport (>= 3.0.0) - rack (1.6.10) - rack-test (0.6.3) - rack (>= 1.0) + rack (2.0.5) + rack-test (1.0.0) + rack (>= 1.0, < 3) rack-timeout (0.5.1) - rails (4.2.10) - actionmailer (= 4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) - activemodel (= 4.2.10) - activerecord (= 4.2.10) - activesupport (= 4.2.10) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.10) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - 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.2.0) + actioncable (= 5.2.0) + actionmailer (= 5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + activemodel (= 5.2.0) + activerecord (= 5.2.0) + activestorage (= 5.2.0) + activesupport (= 5.2.0) + bundler (>= 1.3.0) + railties (= 5.2.0) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) rails-jquery-autocomplete (1.0.3) @@ -327,9 +335,10 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (4.2.10) - actionpack (= 4.2.10) - activesupport (= 4.2.10) + railties (5.2.0) + actionpack (= 5.2.0) + activesupport (= 5.2.0) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) @@ -481,6 +490,9 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) xpath (3.1.0) nokogiri (~> 1.8) @@ -524,7 +536,7 @@ DEPENDENCIES puma (~> 3.7) puma-heroku rack-timeout - rails (~> 4.2) + rails (~> 5.2) rails-jquery-autocomplete rails-perftest rails-ujs From ec67c23b7d5ec4a67653572d8f9220abd2665562 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 5 Jul 2018 01:35:40 -0500 Subject: [PATCH 10/26] address deprecations --- app/controllers/content_controller.rb | 2 +- app/controllers/registrations_controller.rb | 2 +- app/views/universes/_picker.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index dce21de2..8cb3591f 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb @@ -19,7 +19,7 @@ class ContentController < ApplicationController end end - @content = @content.flatten.uniq.sort_by(&:name) + @content = @content.to_a.flatten.uniq.sort_by(&:name) @questioned_content = @content.sample @question = @questioned_content.question unless @questioned_content.nil? diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 9d61c3b6..9465625c 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -1,5 +1,5 @@ class RegistrationsController < Devise::RegistrationsController - after_filter :add_account, only: [:create] + after_action :add_account, only: [:create] def new super diff --git a/app/views/universes/_picker.html.erb b/app/views/universes/_picker.html.erb index 3ab24ad4..87f3584e 100644 --- a/app/views/universes/_picker.html.erb +++ b/app/views/universes/_picker.html.erb @@ -17,7 +17,7 @@
    -
  • <%= link_to "All universes", url_for(params.merge(:universe => :all)) %>
    • +
  • <%= link_to "All universes", "?universe=all" %>
    • <% if current_user %>
  • <% (current_user.universes + current_user.contributable_universes).sort_by(&:name).each do |universe| %> From 7a4c9dfbc178508712ddaa51cd24bc9f384c96a6 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 5 Jul 2018 02:07:12 -0500 Subject: [PATCH 11/26] update tests for 5.2 --- Gemfile | 1 + Gemfile.lock | 5 + db/schema.rb | 2992 ++++++++--------- .../subscriptions_controller_spec.rb | 16 +- spec/controllers/users_controller_spec.rb | 2 +- spec/controllers/write_controller_spec.rb | 2 +- spec/support/content_controller_example.rb | 12 +- 7 files changed, 1450 insertions(+), 1580 deletions(-) diff --git a/Gemfile b/Gemfile index d74ffd6e..54324097 100644 --- a/Gemfile +++ b/Gemfile @@ -109,6 +109,7 @@ group :test do gem 'rubocop', require: false gem 'ruby-prof', '0.15.9' gem 'shoulda-matchers', '~> 3.1' + gem 'rails-controller-testing' end group :test, :development do diff --git a/Gemfile.lock b/Gemfile.lock index 8fd1c72a..8b71f463 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -320,6 +320,10 @@ GEM bundler (>= 1.3.0) railties (= 5.2.0) sprockets-rails (>= 2.0.0) + rails-controller-testing (1.0.2) + actionpack (~> 5.x, >= 5.0.1) + actionview (~> 5.x, >= 5.0.1) + activesupport (~> 5.x) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -537,6 +541,7 @@ DEPENDENCIES puma-heroku rack-timeout rails (~> 5.2) + rails-controller-testing rails-jquery-autocomplete rails-perftest rails-ujs diff --git a/db/schema.rb b/db/schema.rb index 09bda0bd..4d4c9a86 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. @@ -11,14 +10,14 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180620012919) do +ActiveRecord::Schema.define(version: 2018_06_20_012919) do create_table "archenemyships", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "archenemy_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "archenemy_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "artifactships", force: :cascade do |t| @@ -28,75 +27,72 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "attribute_categories", force: :cascade do |t| - t.integer "user_id" - t.string "entity_type" - t.string "name", null: false - t.string "label", null: false - t.string "icon" - t.text "description" + t.integer "user_id" + t.string "entity_type" + t.string "name", null: false + t.string "label", null: false + t.string "icon" + t.text "description" t.datetime "created_at" t.datetime "updated_at" + t.index ["entity_type"], name: "index_attribute_categories_on_entity_type" + t.index ["name"], name: "index_attribute_categories_on_name" end - add_index "attribute_categories", ["entity_type"], name: "index_attribute_categories_on_entity_type" - add_index "attribute_categories", ["name"], name: "index_attribute_categories_on_name" - create_table "attribute_fields", force: :cascade do |t| - t.integer "user_id" - t.integer "attribute_category_id", null: false - t.string "name", null: false - t.string "label", null: false - t.string "field_type", null: false - t.text "description" - t.string "privacy", default: "private", null: false + t.integer "user_id" + t.integer "attribute_category_id", null: false + t.string "name", null: false + t.string "label", null: false + t.string "field_type", null: false + t.text "description" + t.string "privacy", default: "private", null: false t.datetime "created_at" t.datetime "updated_at" + t.index ["user_id", "name"], name: "index_attribute_fields_on_user_id_and_name" end - add_index "attribute_fields", ["user_id", "name"], name: "index_attribute_fields_on_user_id_and_name" - create_table "attributes", force: :cascade do |t| - t.integer "user_id" - t.integer "attribute_field_id" - t.string "entity_type", null: false - t.integer "entity_id", null: false - t.text "value" - t.string "privacy", default: "private", null: false + t.integer "user_id" + t.integer "attribute_field_id" + t.string "entity_type", null: false + t.integer "entity_id", null: false + t.text "value" + t.string "privacy", default: "private", null: false t.datetime "created_at" t.datetime "updated_at" + t.index ["user_id", "entity_type", "entity_id"], name: "index_attributes_on_user_id_and_entity_type_and_entity_id" end - add_index "attributes", ["user_id", "entity_type", "entity_id"], name: "index_attributes_on_user_id_and_entity_type_and_entity_id" - create_table "best_friendships", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "best_friend_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "best_friend_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "billing_plans", force: :cascade do |t| - t.string "name" - t.string "stripe_plan_id" - t.integer "monthly_cents" - t.boolean "available" - t.boolean "allows_core_content" - t.boolean "allows_extended_content" - t.boolean "allows_collective_content" - t.boolean "allows_collaboration" - t.integer "universe_limit" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "bonus_bandwidth_kb", default: 0 + t.string "name" + t.string "stripe_plan_id" + t.integer "monthly_cents" + t.boolean "available" + t.boolean "allows_core_content" + t.boolean "allows_extended_content" + t.boolean "allows_collective_content" + t.boolean "allows_collaboration" + t.integer "universe_limit" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "bonus_bandwidth_kb", default: 0 end create_table "birthings", force: :cascade do |t| - t.integer "character_id" - t.integer "birthplace_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "character_id" + t.integer "birthplace_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "capital_cities_relationships", force: :cascade do |t| @@ -106,159 +102,149 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "character_birthtowns", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "birthtown_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "birthtown_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["character_id"], name: "index_character_birthtowns_on_character_id" + t.index ["user_id"], name: "index_character_birthtowns_on_user_id" end - add_index "character_birthtowns", ["character_id"], name: "index_character_birthtowns_on_character_id" - add_index "character_birthtowns", ["user_id"], name: "index_character_birthtowns_on_user_id" - create_table "character_companions", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "companion_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "companion_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["character_id"], name: "index_character_companions_on_character_id" + t.index ["user_id"], name: "index_character_companions_on_user_id" end - add_index "character_companions", ["character_id"], name: "index_character_companions_on_character_id" - add_index "character_companions", ["user_id"], name: "index_character_companions_on_user_id" - create_table "character_enemies", force: :cascade do |t| - t.integer "character_id" - t.integer "enemy_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "character_id" + t.integer "enemy_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["character_id"], name: "index_character_enemies_on_character_id" + t.index ["user_id"], name: "index_character_enemies_on_user_id" end - add_index "character_enemies", ["character_id"], name: "index_character_enemies_on_character_id" - add_index "character_enemies", ["user_id"], name: "index_character_enemies_on_user_id" - create_table "character_floras", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "flora_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "flora_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["character_id"], name: "index_character_floras_on_character_id" + t.index ["flora_id"], name: "index_character_floras_on_flora_id" + t.index ["user_id"], name: "index_character_floras_on_user_id" end - add_index "character_floras", ["character_id"], name: "index_character_floras_on_character_id" - add_index "character_floras", ["flora_id"], name: "index_character_floras_on_flora_id" - add_index "character_floras", ["user_id"], name: "index_character_floras_on_user_id" - create_table "character_friends", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "friend_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "friend_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["character_id"], name: "index_character_friends_on_character_id" + t.index ["user_id"], name: "index_character_friends_on_user_id" end - add_index "character_friends", ["character_id"], name: "index_character_friends_on_character_id" - add_index "character_friends", ["user_id"], name: "index_character_friends_on_user_id" - create_table "character_items", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "item_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "item_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["character_id"], name: "index_character_items_on_character_id" + t.index ["item_id"], name: "index_character_items_on_item_id" + t.index ["user_id"], name: "index_character_items_on_user_id" end - add_index "character_items", ["character_id"], name: "index_character_items_on_character_id" - add_index "character_items", ["item_id"], name: "index_character_items_on_item_id" - add_index "character_items", ["user_id"], name: "index_character_items_on_user_id" - create_table "character_love_interests", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "love_interest_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "love_interest_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["character_id"], name: "index_character_love_interests_on_character_id" + t.index ["user_id"], name: "index_character_love_interests_on_user_id" end - add_index "character_love_interests", ["character_id"], name: "index_character_love_interests_on_character_id" - add_index "character_love_interests", ["user_id"], name: "index_character_love_interests_on_user_id" - create_table "character_magics", force: :cascade do |t| - t.integer "character_id" - t.integer "magic_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "character_id" + t.integer "magic_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["character_id"], name: "index_character_magics_on_character_id" + t.index ["magic_id"], name: "index_character_magics_on_magic_id" + t.index ["user_id"], name: "index_character_magics_on_user_id" end - add_index "character_magics", ["character_id"], name: "index_character_magics_on_character_id" - add_index "character_magics", ["magic_id"], name: "index_character_magics_on_magic_id" - add_index "character_magics", ["user_id"], name: "index_character_magics_on_user_id" - create_table "character_technologies", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "technology_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "technology_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["character_id"], name: "index_character_technologies_on_character_id" + t.index ["technology_id"], name: "index_character_technologies_on_technology_id" + t.index ["user_id"], name: "index_character_technologies_on_user_id" end - add_index "character_technologies", ["character_id"], name: "index_character_technologies_on_character_id" - add_index "character_technologies", ["technology_id"], name: "index_character_technologies_on_technology_id" - add_index "character_technologies", ["user_id"], name: "index_character_technologies_on_user_id" - create_table "characters", force: :cascade do |t| - t.string "name", null: false - t.string "role" - t.string "gender" - t.string "age" - t.string "height" - t.string "weight" - t.string "haircolor" - t.string "hairstyle" - t.string "facialhair" - t.string "eyecolor" - t.string "race" - t.string "skintone" - t.string "bodytype" - t.string "identmarks" - t.text "religion" - t.text "politics" - t.text "prejudices" - t.text "occupation" - t.text "pets" - t.text "mannerisms" - t.text "birthday" - t.text "birthplace" - t.text "education" - t.text "background" - t.string "fave_color" - t.string "fave_food" - t.string "fave_possession" - t.string "fave_weapon" - t.string "fave_animal" - t.text "notes" - t.text "private_notes" - t.integer "user_id" - t.integer "universe_id" + t.string "name", null: false + t.string "role" + t.string "gender" + t.string "age" + t.string "height" + t.string "weight" + t.string "haircolor" + t.string "hairstyle" + t.string "facialhair" + t.string "eyecolor" + t.string "race" + t.string "skintone" + t.string "bodytype" + t.string "identmarks" + t.text "religion" + t.text "politics" + t.text "prejudices" + t.text "occupation" + t.text "pets" + t.text "mannerisms" + t.text "birthday" + t.text "birthplace" + t.text "education" + t.text "background" + t.string "fave_color" + t.string "fave_food" + t.string "fave_possession" + t.string "fave_weapon" + t.string "fave_animal" + t.text "notes" + t.text "private_notes" + t.integer "user_id" + t.integer "universe_id" t.datetime "created_at" t.datetime "updated_at" - t.string "privacy" - t.string "archetype" - t.string "aliases" - t.string "motivations" - t.string "flaws" - t.string "talents" - t.string "hobbies" - t.string "personality_type" + t.string "privacy" + t.string "archetype" + t.string "aliases" + t.string "motivations" + t.string "flaws" + t.string "talents" + t.string "hobbies" + t.string "personality_type" t.datetime "deleted_at" + t.index ["deleted_at"], name: "index_characters_on_deleted_at" + t.index ["universe_id"], name: "index_characters_on_universe_id" + t.index ["user_id"], name: "index_characters_on_user_id" end - add_index "characters", ["deleted_at"], name: "index_characters_on_deleted_at" - add_index "characters", ["universe_id"], name: "index_characters_on_universe_id" - add_index "characters", ["user_id"], name: "index_characters_on_user_id" - create_table "childrenships", force: :cascade do |t| t.integer "user_id" t.integer "character_id" @@ -266,205 +252,193 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "content_change_events", force: :cascade do |t| - t.integer "user_id" - t.text "changed_fields" - t.integer "content_id" - t.string "content_type" - t.string "action" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.text "changed_fields" + t.integer "content_id" + t.string "content_type" + t.string "action" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["content_id", "content_type"], name: "index_content_change_events_on_content_id_and_content_type" + t.index ["user_id"], name: "index_content_change_events_on_user_id" end - add_index "content_change_events", ["content_id", "content_type"], name: "index_content_change_events_on_content_id_and_content_type" - add_index "content_change_events", ["user_id"], name: "index_content_change_events_on_user_id" - create_table "contributors", force: :cascade do |t| - t.integer "universe_id" - t.string "email" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "universe_id" + t.string "email" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["universe_id"], name: "index_contributors_on_universe_id" + t.index ["user_id"], name: "index_contributors_on_user_id" end - add_index "contributors", ["universe_id"], name: "index_contributors_on_universe_id" - add_index "contributors", ["user_id"], name: "index_contributors_on_user_id" - create_table "countries", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "other_names" - t.integer "universe_id" - t.string "population" - t.string "currency" - t.string "laws" - t.string "sports" - t.string "area" - t.string "crops" - t.string "climate" - t.string "founding_story" - t.string "established_year" - t.string "notable_wars" - t.string "notes" - t.string "private_notes" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.string "name" + t.string "description" + t.string "other_names" + t.integer "universe_id" + t.string "population" + t.string "currency" + t.string "laws" + t.string "sports" + t.string "area" + t.string "crops" + t.string "climate" + t.string "founding_story" + t.string "established_year" + t.string "notable_wars" + t.string "notes" + t.string "private_notes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.datetime "deleted_at" - t.string "privacy" - t.integer "user_id" + t.string "privacy" + t.integer "user_id" + t.index ["universe_id"], name: "index_countries_on_universe_id" + t.index ["user_id"], name: "index_countries_on_user_id" end - add_index "countries", ["universe_id"], name: "index_countries_on_universe_id" - add_index "countries", ["user_id"], name: "index_countries_on_user_id" - create_table "country_creatures", force: :cascade do |t| - t.integer "user_id" - t.integer "country_id" - t.integer "creature_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "country_id" + t.integer "creature_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["country_id"], name: "index_country_creatures_on_country_id" + t.index ["creature_id"], name: "index_country_creatures_on_creature_id" + t.index ["user_id"], name: "index_country_creatures_on_user_id" end - add_index "country_creatures", ["country_id"], name: "index_country_creatures_on_country_id" - add_index "country_creatures", ["creature_id"], name: "index_country_creatures_on_creature_id" - add_index "country_creatures", ["user_id"], name: "index_country_creatures_on_user_id" - create_table "country_floras", force: :cascade do |t| - t.integer "user_id" - t.integer "country_id" - t.integer "flora_id" + t.integer "user_id" + t.integer "country_id" + t.integer "flora_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["country_id"], name: "index_country_floras_on_country_id" + t.index ["flora_id"], name: "index_country_floras_on_flora_id" + t.index ["user_id"], name: "index_country_floras_on_user_id" end - add_index "country_floras", ["country_id"], name: "index_country_floras_on_country_id" - add_index "country_floras", ["flora_id"], name: "index_country_floras_on_flora_id" - add_index "country_floras", ["user_id"], name: "index_country_floras_on_user_id" - create_table "country_governments", force: :cascade do |t| - t.integer "country_id" - t.integer "government_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "country_governments", ["country_id"], name: "index_country_governments_on_country_id" - add_index "country_governments", ["government_id"], name: "index_country_governments_on_government_id" - add_index "country_governments", ["user_id"], name: "index_country_governments_on_user_id" - - create_table "country_landmarks", force: :cascade do |t| - t.integer "user_id" - t.integer "country_id" - t.integer "landmark_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "country_landmarks", ["country_id"], name: "index_country_landmarks_on_country_id" - add_index "country_landmarks", ["landmark_id"], name: "index_country_landmarks_on_landmark_id" - add_index "country_landmarks", ["user_id"], name: "index_country_landmarks_on_user_id" - - create_table "country_languages", force: :cascade do |t| - t.integer "user_id" - t.integer "country_id" - t.integer "language_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "country_languages", ["country_id"], name: "index_country_languages_on_country_id" - add_index "country_languages", ["language_id"], name: "index_country_languages_on_language_id" - add_index "country_languages", ["user_id"], name: "index_country_languages_on_user_id" - - create_table "country_locations", force: :cascade do |t| - t.integer "user_id" - t.integer "country_id" - t.integer "location_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "country_locations", ["country_id"], name: "index_country_locations_on_country_id" - add_index "country_locations", ["location_id"], name: "index_country_locations_on_location_id" - add_index "country_locations", ["user_id"], name: "index_country_locations_on_user_id" - - create_table "country_religions", force: :cascade do |t| - t.integer "user_id" - t.integer "country_id" - t.integer "religion_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "country_religions", ["country_id"], name: "index_country_religions_on_country_id" - add_index "country_religions", ["religion_id"], name: "index_country_religions_on_religion_id" - add_index "country_religions", ["user_id"], name: "index_country_religions_on_user_id" - - create_table "country_towns", force: :cascade do |t| - t.integer "user_id" - t.integer "country_id" - t.integer "town_id" + t.integer "country_id" + t.integer "government_id" + t.integer "user_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["country_id"], name: "index_country_governments_on_country_id" + t.index ["government_id"], name: "index_country_governments_on_government_id" + t.index ["user_id"], name: "index_country_governments_on_user_id" end - add_index "country_towns", ["country_id"], name: "index_country_towns_on_country_id" - add_index "country_towns", ["town_id"], name: "index_country_towns_on_town_id" - add_index "country_towns", ["user_id"], name: "index_country_towns_on_user_id" + create_table "country_landmarks", force: :cascade do |t| + t.integer "user_id" + t.integer "country_id" + t.integer "landmark_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["country_id"], name: "index_country_landmarks_on_country_id" + t.index ["landmark_id"], name: "index_country_landmarks_on_landmark_id" + t.index ["user_id"], name: "index_country_landmarks_on_user_id" + end + + create_table "country_languages", force: :cascade do |t| + t.integer "user_id" + t.integer "country_id" + t.integer "language_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["country_id"], name: "index_country_languages_on_country_id" + t.index ["language_id"], name: "index_country_languages_on_language_id" + t.index ["user_id"], name: "index_country_languages_on_user_id" + end + + create_table "country_locations", force: :cascade do |t| + t.integer "user_id" + t.integer "country_id" + t.integer "location_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["country_id"], name: "index_country_locations_on_country_id" + t.index ["location_id"], name: "index_country_locations_on_location_id" + t.index ["user_id"], name: "index_country_locations_on_user_id" + end + + create_table "country_religions", force: :cascade do |t| + t.integer "user_id" + t.integer "country_id" + t.integer "religion_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["country_id"], name: "index_country_religions_on_country_id" + t.index ["religion_id"], name: "index_country_religions_on_religion_id" + t.index ["user_id"], name: "index_country_religions_on_user_id" + end + + create_table "country_towns", force: :cascade do |t| + t.integer "user_id" + t.integer "country_id" + t.integer "town_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["country_id"], name: "index_country_towns_on_country_id" + t.index ["town_id"], name: "index_country_towns_on_town_id" + t.index ["user_id"], name: "index_country_towns_on_user_id" + end create_table "creature_relationships", force: :cascade do |t| - t.integer "user_id" - t.integer "creature_id" - t.integer "related_creature_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "creature_id" + t.integer "related_creature_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "creatures", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "type_of" - t.string "other_names" - t.integer "universe_id" - t.string "color" - t.string "shape" - t.string "size" - t.string "notable_features" - t.string "materials" - t.string "preferred_habitat" - t.string "sounds" - t.string "strengths" - t.string "weaknesses" - t.string "spoils" - t.string "aggressiveness" - t.string "attack_method" - t.string "defense_method" - t.string "maximum_speed" - t.string "food_sources" - t.string "migratory_patterns" - t.string "reproduction" - t.string "herd_patterns" - t.string "similar_animals" - t.string "symbolisms" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "user_id" - t.string "notes" - t.string "private_notes" - t.string "privacy" + t.string "name" + t.string "description" + t.string "type_of" + t.string "other_names" + t.integer "universe_id" + t.string "color" + t.string "shape" + t.string "size" + t.string "notable_features" + t.string "materials" + t.string "preferred_habitat" + t.string "sounds" + t.string "strengths" + t.string "weaknesses" + t.string "spoils" + t.string "aggressiveness" + t.string "attack_method" + t.string "defense_method" + t.string "maximum_speed" + t.string "food_sources" + t.string "migratory_patterns" + t.string "reproduction" + t.string "herd_patterns" + t.string "similar_animals" + t.string "symbolisms" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "user_id" + t.string "notes" + t.string "private_notes" + t.string "privacy" t.datetime "deleted_at" - t.string "phylum" - t.string "class_string" - t.string "order" - t.string "family" - t.string "genus" - t.string "species" + t.string "phylum" + t.string "class_string" + t.string "order" + t.string "family" + t.string "genus" + t.string "species" + t.index ["deleted_at"], name: "index_creatures_on_deleted_at" + t.index ["universe_id"], name: "index_creatures_on_universe_id" + t.index ["user_id"], name: "index_creatures_on_user_id" end - add_index "creatures", ["deleted_at"], name: "index_creatures_on_deleted_at" - add_index "creatures", ["universe_id"], name: "index_creatures_on_universe_id" - add_index "creatures", ["user_id"], name: "index_creatures_on_user_id" - create_table "current_ownerships", force: :cascade do |t| t.integer "user_id" t.integer "item_id" @@ -472,215 +446,198 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "deities", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "other_names" - t.string "physical_description" - t.string "height" - t.string "weight" - t.string "symbols" - t.string "elements" - t.string "strengths" - t.string "weaknesses" - t.string "prayers" - t.string "rituals" - t.string "human_interaction" - t.string "notable_events" - t.string "family_history" - t.string "life_story" - t.string "notes" - t.string "private_notes" - t.string "privacy" - t.integer "user_id" - t.integer "universe_id" + t.string "name" + t.string "description" + t.string "other_names" + t.string "physical_description" + t.string "height" + t.string "weight" + t.string "symbols" + t.string "elements" + t.string "strengths" + t.string "weaknesses" + t.string "prayers" + t.string "rituals" + t.string "human_interaction" + t.string "notable_events" + t.string "family_history" + t.string "life_story" + t.string "notes" + t.string "private_notes" + t.string "privacy" + t.integer "user_id" + t.integer "universe_id" t.datetime "deleted_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["universe_id"], name: "index_deities_on_universe_id" + t.index ["user_id"], name: "index_deities_on_user_id" end - add_index "deities", ["universe_id"], name: "index_deities_on_universe_id" - add_index "deities", ["user_id"], name: "index_deities_on_user_id" - create_table "deity_abilities", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "ability_id" + t.integer "user_id" + t.integer "deity_id" + t.integer "ability_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_abilities_on_deity_id" + t.index ["user_id"], name: "index_deity_abilities_on_user_id" end - add_index "deity_abilities", ["deity_id"], name: "index_deity_abilities_on_deity_id" - add_index "deity_abilities", ["user_id"], name: "index_deity_abilities_on_user_id" - create_table "deity_character_children", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "character_child_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "deity_id" + t.integer "character_child_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_character_children_on_deity_id" + t.index ["user_id"], name: "index_deity_character_children_on_user_id" end - add_index "deity_character_children", ["deity_id"], name: "index_deity_character_children_on_deity_id" - add_index "deity_character_children", ["user_id"], name: "index_deity_character_children_on_user_id" - create_table "deity_character_parents", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "character_parent_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "deity_id" + t.integer "character_parent_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_character_parents_on_deity_id" + t.index ["user_id"], name: "index_deity_character_parents_on_user_id" end - add_index "deity_character_parents", ["deity_id"], name: "index_deity_character_parents_on_deity_id" - add_index "deity_character_parents", ["user_id"], name: "index_deity_character_parents_on_user_id" - create_table "deity_character_partners", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "character_partner_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "deity_id" + t.integer "character_partner_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_character_partners_on_deity_id" + t.index ["user_id"], name: "index_deity_character_partners_on_user_id" end - add_index "deity_character_partners", ["deity_id"], name: "index_deity_character_partners_on_deity_id" - add_index "deity_character_partners", ["user_id"], name: "index_deity_character_partners_on_user_id" - create_table "deity_character_siblings", force: :cascade do |t| - t.integer "deity_id" - t.integer "character_sibling_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "deity_id" + t.integer "character_sibling_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_character_siblings_on_deity_id" + t.index ["user_id"], name: "index_deity_character_siblings_on_user_id" end - add_index "deity_character_siblings", ["deity_id"], name: "index_deity_character_siblings_on_deity_id" - add_index "deity_character_siblings", ["user_id"], name: "index_deity_character_siblings_on_user_id" - create_table "deity_creatures", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "creature_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "deity_id" + t.integer "creature_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["creature_id"], name: "index_deity_creatures_on_creature_id" + t.index ["deity_id"], name: "index_deity_creatures_on_deity_id" + t.index ["user_id"], name: "index_deity_creatures_on_user_id" end - add_index "deity_creatures", ["creature_id"], name: "index_deity_creatures_on_creature_id" - add_index "deity_creatures", ["deity_id"], name: "index_deity_creatures_on_deity_id" - add_index "deity_creatures", ["user_id"], name: "index_deity_creatures_on_user_id" - create_table "deity_deity_children", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "deity_child_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "deity_id" + t.integer "deity_child_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_deity_children_on_deity_id" + t.index ["user_id"], name: "index_deity_deity_children_on_user_id" end - add_index "deity_deity_children", ["deity_id"], name: "index_deity_deity_children_on_deity_id" - add_index "deity_deity_children", ["user_id"], name: "index_deity_deity_children_on_user_id" - create_table "deity_deity_parents", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "deity_parent_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "deity_id" + t.integer "deity_parent_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_deity_parents_on_deity_id" + t.index ["user_id"], name: "index_deity_deity_parents_on_user_id" end - add_index "deity_deity_parents", ["deity_id"], name: "index_deity_deity_parents_on_deity_id" - add_index "deity_deity_parents", ["user_id"], name: "index_deity_deity_parents_on_user_id" - create_table "deity_deity_partners", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "deity_partner_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "deity_id" + t.integer "deity_partner_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_deity_partners_on_deity_id" + t.index ["user_id"], name: "index_deity_deity_partners_on_user_id" end - add_index "deity_deity_partners", ["deity_id"], name: "index_deity_deity_partners_on_deity_id" - add_index "deity_deity_partners", ["user_id"], name: "index_deity_deity_partners_on_user_id" - create_table "deity_deity_siblings", force: :cascade do |t| - t.integer "deity_id" - t.integer "deity_sibling_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "deity_id" + t.integer "deity_sibling_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_deity_siblings_on_deity_id" + t.index ["user_id"], name: "index_deity_deity_siblings_on_user_id" end - add_index "deity_deity_siblings", ["deity_id"], name: "index_deity_deity_siblings_on_deity_id" - add_index "deity_deity_siblings", ["user_id"], name: "index_deity_deity_siblings_on_user_id" - create_table "deity_floras", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "flora_id" + t.integer "user_id" + t.integer "deity_id" + t.integer "flora_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_floras_on_deity_id" + t.index ["flora_id"], name: "index_deity_floras_on_flora_id" + t.index ["user_id"], name: "index_deity_floras_on_user_id" end - add_index "deity_floras", ["deity_id"], name: "index_deity_floras_on_deity_id" - add_index "deity_floras", ["flora_id"], name: "index_deity_floras_on_flora_id" - add_index "deity_floras", ["user_id"], name: "index_deity_floras_on_user_id" - create_table "deity_races", force: :cascade do |t| - t.integer "deity_id" - t.integer "race_id" - t.integer "user_id" + t.integer "deity_id" + t.integer "race_id" + t.integer "user_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_races_on_deity_id" + t.index ["race_id"], name: "index_deity_races_on_race_id" + t.index ["user_id"], name: "index_deity_races_on_user_id" end - add_index "deity_races", ["deity_id"], name: "index_deity_races_on_deity_id" - add_index "deity_races", ["race_id"], name: "index_deity_races_on_race_id" - add_index "deity_races", ["user_id"], name: "index_deity_races_on_user_id" - create_table "deity_related_landmarks", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "related_landmark_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "deity_related_landmarks", ["deity_id"], name: "index_deity_related_landmarks_on_deity_id" - add_index "deity_related_landmarks", ["user_id"], name: "index_deity_related_landmarks_on_user_id" - - create_table "deity_related_towns", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "related_town_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "deity_related_towns", ["deity_id"], name: "index_deity_related_towns_on_deity_id" - add_index "deity_related_towns", ["user_id"], name: "index_deity_related_towns_on_user_id" - - create_table "deity_relics", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "relic_id" + t.integer "user_id" + t.integer "deity_id" + t.integer "related_landmark_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_related_landmarks_on_deity_id" + t.index ["user_id"], name: "index_deity_related_landmarks_on_user_id" end - add_index "deity_relics", ["deity_id"], name: "index_deity_relics_on_deity_id" - add_index "deity_relics", ["user_id"], name: "index_deity_relics_on_user_id" + create_table "deity_related_towns", force: :cascade do |t| + t.integer "user_id" + t.integer "deity_id" + t.integer "related_town_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_related_towns_on_deity_id" + t.index ["user_id"], name: "index_deity_related_towns_on_user_id" + end + + create_table "deity_relics", force: :cascade do |t| + t.integer "user_id" + t.integer "deity_id" + t.integer "relic_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_relics_on_deity_id" + t.index ["user_id"], name: "index_deity_relics_on_user_id" + end create_table "deity_religions", force: :cascade do |t| - t.integer "user_id" - t.integer "deity_id" - t.integer "religion_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "deity_id" + t.integer "religion_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_deity_religions_on_deity_id" + t.index ["religion_id"], name: "index_deity_religions_on_religion_id" + t.index ["user_id"], name: "index_deity_religions_on_user_id" end - add_index "deity_religions", ["deity_id"], name: "index_deity_religions_on_deity_id" - add_index "deity_religions", ["religion_id"], name: "index_deity_religions_on_religion_id" - add_index "deity_religions", ["user_id"], name: "index_deity_religions_on_user_id" - create_table "deityships", force: :cascade do |t| t.integer "religion_id" t.integer "deity_id" @@ -688,30 +645,28 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "delayed_jobs", force: :cascade do |t| - t.integer "priority", default: 0, null: false - t.integer "attempts", default: 0, null: false - t.text "handler", null: false - t.text "last_error" + t.integer "priority", default: 0, null: false + t.integer "attempts", default: 0, null: false + t.text "handler", null: false + t.text "last_error" t.datetime "run_at" t.datetime "locked_at" t.datetime "failed_at" - t.string "locked_by" - t.string "queue" + t.string "locked_by" + t.string "queue" t.datetime "created_at" t.datetime "updated_at" + t.index ["priority", "run_at"], name: "delayed_jobs_priority" end - add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority" - create_table "documents", force: :cascade do |t| - t.integer "user_id" - t.text "body" + t.integer "user_id" + t.text "body" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_documents_on_user_id" end - add_index "documents", ["user_id"], name: "index_documents_on_user_id" - create_table "famous_figureships", force: :cascade do |t| t.integer "user_id" t.integer "race_id" @@ -719,196 +674,187 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "fatherships", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "father_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "father_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "flora_eaten_bies", force: :cascade do |t| - t.integer "flora_id" - t.integer "creature_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "flora_id" + t.integer "creature_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "flora_locations", force: :cascade do |t| - t.integer "flora_id" - t.integer "location_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "flora_id" + t.integer "location_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "flora_magical_effects", force: :cascade do |t| - t.integer "flora_id" - t.integer "magic_id" + t.integer "flora_id" + t.integer "magic_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false end create_table "flora_relationships", force: :cascade do |t| - t.integer "flora_id" - t.integer "related_flora_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "flora_id" + t.integer "related_flora_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "floras", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "aliases" - t.string "order" - t.string "family" - t.string "genus" - t.string "colorings" - t.string "size" - t.string "smell" - t.string "taste" - t.string "fruits" - t.string "seeds" - t.string "nuts" - t.string "berries" - t.string "medicinal_purposes" - t.string "reproduction" - t.string "seasonality" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "user_id" - t.integer "universe_id" - t.string "notes" - t.string "private_notes" - t.string "privacy" + t.string "name" + t.string "description" + t.string "aliases" + t.string "order" + t.string "family" + t.string "genus" + t.string "colorings" + t.string "size" + t.string "smell" + t.string "taste" + t.string "fruits" + t.string "seeds" + t.string "nuts" + t.string "berries" + t.string "medicinal_purposes" + t.string "reproduction" + t.string "seasonality" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "universe_id" + t.string "notes" + t.string "private_notes" + t.string "privacy" t.datetime "deleted_at" - t.string "material_uses" + t.string "material_uses" + t.index ["deleted_at"], name: "index_floras_on_deleted_at" + t.index ["universe_id"], name: "index_floras_on_universe_id" + t.index ["user_id"], name: "index_floras_on_user_id" end - add_index "floras", ["deleted_at"], name: "index_floras_on_deleted_at" - add_index "floras", ["universe_id"], name: "index_floras_on_universe_id" - add_index "floras", ["user_id"], name: "index_floras_on_user_id" - create_table "friendly_id_slugs", force: :cascade do |t| - t.string "slug", null: false - t.integer "sluggable_id", null: false - t.string "sluggable_type", limit: 50 - t.string "scope" + t.string "slug", null: false + t.integer "sluggable_id", null: false + t.string "sluggable_type", limit: 50 + t.string "scope" t.datetime "created_at" + t.index ["slug", "sluggable_type", "scope"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope", unique: true + t.index ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type" + t.index ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id" + t.index ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type" end - add_index "friendly_id_slugs", ["slug", "sluggable_type", "scope"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope", unique: true - add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type" - add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id" - add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type" - create_table "government_creatures", force: :cascade do |t| - t.integer "user_id" - t.integer "government_id" - t.integer "creature_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "government_id" + t.integer "creature_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["creature_id"], name: "index_government_creatures_on_creature_id" + t.index ["government_id"], name: "index_government_creatures_on_government_id" + t.index ["user_id"], name: "index_government_creatures_on_user_id" end - add_index "government_creatures", ["creature_id"], name: "index_government_creatures_on_creature_id" - add_index "government_creatures", ["government_id"], name: "index_government_creatures_on_government_id" - add_index "government_creatures", ["user_id"], name: "index_government_creatures_on_user_id" - create_table "government_groups", force: :cascade do |t| - t.integer "user_id" - t.integer "government_id" - t.integer "group_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "government_id" + t.integer "group_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["government_id"], name: "index_government_groups_on_government_id" + t.index ["group_id"], name: "index_government_groups_on_group_id" + t.index ["user_id"], name: "index_government_groups_on_user_id" end - add_index "government_groups", ["government_id"], name: "index_government_groups_on_government_id" - add_index "government_groups", ["group_id"], name: "index_government_groups_on_group_id" - add_index "government_groups", ["user_id"], name: "index_government_groups_on_user_id" - create_table "government_items", force: :cascade do |t| - t.integer "user_id" - t.integer "government_id" - t.integer "item_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "government_id" + t.integer "item_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["government_id"], name: "index_government_items_on_government_id" + t.index ["item_id"], name: "index_government_items_on_item_id" + t.index ["user_id"], name: "index_government_items_on_user_id" end - add_index "government_items", ["government_id"], name: "index_government_items_on_government_id" - add_index "government_items", ["item_id"], name: "index_government_items_on_item_id" - add_index "government_items", ["user_id"], name: "index_government_items_on_user_id" - create_table "government_leaders", force: :cascade do |t| - t.integer "user_id" - t.integer "government_id" - t.integer "leader_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "government_id" + t.integer "leader_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["government_id"], name: "index_government_leaders_on_government_id" + t.index ["user_id"], name: "index_government_leaders_on_user_id" end - add_index "government_leaders", ["government_id"], name: "index_government_leaders_on_government_id" - add_index "government_leaders", ["user_id"], name: "index_government_leaders_on_user_id" - create_table "government_political_figures", force: :cascade do |t| - t.integer "user_id" - t.integer "government_id" - t.integer "political_figure_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "government_id" + t.integer "political_figure_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["government_id"], name: "index_government_political_figures_on_government_id" + t.index ["user_id"], name: "index_government_political_figures_on_user_id" end - add_index "government_political_figures", ["government_id"], name: "index_government_political_figures_on_government_id" - add_index "government_political_figures", ["user_id"], name: "index_government_political_figures_on_user_id" - create_table "government_technologies", force: :cascade do |t| - t.integer "user_id" - t.integer "government_id" - t.integer "technology_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "government_id" + t.integer "technology_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["government_id"], name: "index_government_technologies_on_government_id" + t.index ["technology_id"], name: "index_government_technologies_on_technology_id" + t.index ["user_id"], name: "index_government_technologies_on_user_id" end - add_index "government_technologies", ["government_id"], name: "index_government_technologies_on_government_id" - add_index "government_technologies", ["technology_id"], name: "index_government_technologies_on_technology_id" - add_index "government_technologies", ["user_id"], name: "index_government_technologies_on_user_id" - create_table "governments", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "type_of_government" - t.string "power_structure" - t.string "power_source" - t.string "checks_and_balances" - t.string "sociopolitical" - t.string "socioeconomical" - t.string "geocultural" - t.string "laws" - t.string "immigration" - t.string "privacy_ideologies" - t.string "electoral_process" - t.string "term_lengths" - t.string "criminal_system" - t.string "approval_ratings" - t.string "military" - t.string "navy" - t.string "airforce" - t.string "space_program" - t.string "international_relations" - t.string "civilian_life" - t.string "founding_story" - t.string "flag_design_story" - t.string "notable_wars" - t.string "notes" - t.string "private_notes" - t.string "privacy" - t.integer "user_id" - t.integer "universe_id" + t.string "name" + t.string "description" + t.string "type_of_government" + t.string "power_structure" + t.string "power_source" + t.string "checks_and_balances" + t.string "sociopolitical" + t.string "socioeconomical" + t.string "geocultural" + t.string "laws" + t.string "immigration" + t.string "privacy_ideologies" + t.string "electoral_process" + t.string "term_lengths" + t.string "criminal_system" + t.string "approval_ratings" + t.string "military" + t.string "navy" + t.string "airforce" + t.string "space_program" + t.string "international_relations" + t.string "civilian_life" + t.string "founding_story" + t.string "flag_design_story" + t.string "notable_wars" + t.string "notes" + t.string "private_notes" + t.string "privacy" + t.integer "user_id" + t.integer "universe_id" t.datetime "deleted_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["universe_id"], name: "index_governments_on_universe_id" + t.index ["user_id"], name: "index_governments_on_user_id" end - add_index "governments", ["universe_id"], name: "index_governments_on_universe_id" - add_index "governments", ["user_id"], name: "index_governments_on_user_id" - create_table "group_allyships", force: :cascade do |t| t.integer "user_id" t.integer "group_id" @@ -922,17 +868,16 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "group_creatures", force: :cascade do |t| - t.integer "group_id" - t.integer "creature_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "group_id" + t.integer "creature_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["creature_id"], name: "index_group_creatures_on_creature_id" + t.index ["group_id"], name: "index_group_creatures_on_group_id" + t.index ["user_id"], name: "index_group_creatures_on_user_id" end - add_index "group_creatures", ["creature_id"], name: "index_group_creatures_on_creature_id" - add_index "group_creatures", ["group_id"], name: "index_group_creatures_on_group_id" - add_index "group_creatures", ["user_id"], name: "index_group_creatures_on_user_id" - create_table "group_enemyships", force: :cascade do |t| t.integer "user_id" t.integer "group_id" @@ -976,29 +921,28 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "groups", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "other_names" - t.integer "universe_id" - t.integer "user_id" - t.string "organization_structure" - t.string "motivation" - t.string "goal" - t.string "obstacles" - t.string "risks" - t.string "inventory" - t.string "notes" - t.string "private_notes" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "privacy" + t.string "name" + t.string "description" + t.string "other_names" + t.integer "universe_id" + t.integer "user_id" + t.string "organization_structure" + t.string "motivation" + t.string "goal" + t.string "obstacles" + t.string "risks" + t.string "inventory" + t.string "notes" + t.string "private_notes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "privacy" t.datetime "deleted_at" + t.index ["deleted_at"], name: "index_groups_on_deleted_at" + t.index ["universe_id"], name: "index_groups_on_universe_id" + t.index ["user_id"], name: "index_groups_on_user_id" end - add_index "groups", ["deleted_at"], name: "index_groups_on_deleted_at" - add_index "groups", ["universe_id"], name: "index_groups_on_universe_id" - add_index "groups", ["user_id"], name: "index_groups_on_user_id" - create_table "headquarterships", force: :cascade do |t| t.integer "user_id" t.integer "group_id" @@ -1006,58 +950,55 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "image_uploads", force: :cascade do |t| - t.string "privacy" - t.integer "user_id" - t.string "content_type" - t.integer "content_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "src_file_name" - t.string "src_content_type" - t.integer "src_file_size" - t.datetime "src_updated_at" - end - - add_index "image_uploads", ["content_type", "content_id"], name: "index_image_uploads_on_content_type_and_content_id" - add_index "image_uploads", ["user_id"], name: "index_image_uploads_on_user_id" - - create_table "item_magics", force: :cascade do |t| - t.integer "item_id" - t.integer "magic_id" - t.integer "user_id" + t.string "privacy" + t.integer "user_id" + t.string "content_type" + t.integer "content_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "src_file_name" + t.string "src_content_type" + t.integer "src_file_size" + t.datetime "src_updated_at" + t.index ["content_type", "content_id"], name: "index_image_uploads_on_content_type_and_content_id" + t.index ["user_id"], name: "index_image_uploads_on_user_id" end - add_index "item_magics", ["item_id"], name: "index_item_magics_on_item_id" - add_index "item_magics", ["magic_id"], name: "index_item_magics_on_magic_id" - add_index "item_magics", ["user_id"], name: "index_item_magics_on_user_id" + create_table "item_magics", force: :cascade do |t| + t.integer "item_id" + t.integer "magic_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["item_id"], name: "index_item_magics_on_item_id" + t.index ["magic_id"], name: "index_item_magics_on_magic_id" + t.index ["user_id"], name: "index_item_magics_on_user_id" + end create_table "items", force: :cascade do |t| - t.string "name", null: false - t.string "item_type" - t.text "description" - t.string "weight" - t.string "original_owner" - t.string "current_owner" - t.text "made_by" - t.text "materials" - t.string "year_made" - t.text "magic" - t.text "notes" - t.text "private_notes" - t.integer "user_id" - t.integer "universe_id" + t.string "name", null: false + t.string "item_type" + t.text "description" + t.string "weight" + t.string "original_owner" + t.string "current_owner" + t.text "made_by" + t.text "materials" + t.string "year_made" + t.text "magic" + t.text "notes" + t.text "private_notes" + t.integer "user_id" + t.integer "universe_id" t.datetime "created_at" t.datetime "updated_at" - t.string "privacy", default: "private", null: false + t.string "privacy", default: "private", null: false t.datetime "deleted_at" + t.index ["deleted_at"], name: "index_items_on_deleted_at" + t.index ["universe_id"], name: "index_items_on_universe_id" + t.index ["user_id"], name: "index_items_on_user_id" end - add_index "items", ["deleted_at"], name: "index_items_on_deleted_at" - add_index "items", ["universe_id"], name: "index_items_on_universe_id" - add_index "items", ["user_id"], name: "index_items_on_user_id" - create_table "key_itemships", force: :cascade do |t| t.integer "user_id" t.integer "group_id" @@ -1065,99 +1006,93 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "landmark_countries", force: :cascade do |t| - t.integer "user_id" - t.integer "landmark_id" - t.integer "country_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "landmark_id" + t.integer "country_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["country_id"], name: "index_landmark_countries_on_country_id" + t.index ["landmark_id"], name: "index_landmark_countries_on_landmark_id" + t.index ["user_id"], name: "index_landmark_countries_on_user_id" end - add_index "landmark_countries", ["country_id"], name: "index_landmark_countries_on_country_id" - add_index "landmark_countries", ["landmark_id"], name: "index_landmark_countries_on_landmark_id" - add_index "landmark_countries", ["user_id"], name: "index_landmark_countries_on_user_id" - create_table "landmark_creatures", force: :cascade do |t| - t.integer "user_id" - t.integer "landmark_id" - t.integer "creature_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "landmark_id" + t.integer "creature_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["creature_id"], name: "index_landmark_creatures_on_creature_id" + t.index ["landmark_id"], name: "index_landmark_creatures_on_landmark_id" + t.index ["user_id"], name: "index_landmark_creatures_on_user_id" end - add_index "landmark_creatures", ["creature_id"], name: "index_landmark_creatures_on_creature_id" - add_index "landmark_creatures", ["landmark_id"], name: "index_landmark_creatures_on_landmark_id" - add_index "landmark_creatures", ["user_id"], name: "index_landmark_creatures_on_user_id" - create_table "landmark_floras", force: :cascade do |t| - t.integer "user_id" - t.integer "landmark_id" - t.integer "flora_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "landmark_id" + t.integer "flora_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["flora_id"], name: "index_landmark_floras_on_flora_id" + t.index ["landmark_id"], name: "index_landmark_floras_on_landmark_id" + t.index ["user_id"], name: "index_landmark_floras_on_user_id" end - add_index "landmark_floras", ["flora_id"], name: "index_landmark_floras_on_flora_id" - add_index "landmark_floras", ["landmark_id"], name: "index_landmark_floras_on_landmark_id" - add_index "landmark_floras", ["user_id"], name: "index_landmark_floras_on_user_id" - create_table "landmark_nearby_towns", force: :cascade do |t| - t.integer "user_id" - t.integer "landmark_id" - t.integer "nearby_town_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "landmark_id" + t.integer "nearby_town_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["landmark_id"], name: "index_landmark_nearby_towns_on_landmark_id" + t.index ["user_id"], name: "index_landmark_nearby_towns_on_user_id" end - add_index "landmark_nearby_towns", ["landmark_id"], name: "index_landmark_nearby_towns_on_landmark_id" - add_index "landmark_nearby_towns", ["user_id"], name: "index_landmark_nearby_towns_on_user_id" - create_table "landmarks", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "other_names" - t.integer "universe_id" - t.string "size" - t.string "materials" - t.string "colors" - t.string "creation_story" - t.string "established_year" - t.string "notes" - t.string "private_notes" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.string "name" + t.string "description" + t.string "other_names" + t.integer "universe_id" + t.string "size" + t.string "materials" + t.string "colors" + t.string "creation_story" + t.string "established_year" + t.string "notes" + t.string "private_notes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.datetime "deleted_at" - t.string "privacy" - t.integer "user_id" + t.string "privacy" + t.integer "user_id" + t.index ["universe_id"], name: "index_landmarks_on_universe_id" + t.index ["user_id"], name: "index_landmarks_on_user_id" end - add_index "landmarks", ["universe_id"], name: "index_landmarks_on_universe_id" - add_index "landmarks", ["user_id"], name: "index_landmarks_on_user_id" - create_table "languages", force: :cascade do |t| - t.string "name" - t.string "other_names" - t.integer "universe_id" - t.integer "user_id" - t.string "history" - t.string "typology" - t.string "dialectical_information" - t.string "register" - t.string "phonology" - t.string "grammar" - t.string "numbers" - t.string "quantifiers" - t.string "notes" - t.string "private_notes" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "privacy" + t.string "name" + t.string "other_names" + t.integer "universe_id" + t.integer "user_id" + t.string "history" + t.string "typology" + t.string "dialectical_information" + t.string "register" + t.string "phonology" + t.string "grammar" + t.string "numbers" + t.string "quantifiers" + t.string "notes" + t.string "private_notes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "privacy" t.datetime "deleted_at" + t.index ["deleted_at"], name: "index_languages_on_deleted_at" + t.index ["universe_id"], name: "index_languages_on_universe_id" + t.index ["user_id"], name: "index_languages_on_user_id" end - add_index "languages", ["deleted_at"], name: "index_languages_on_deleted_at" - add_index "languages", ["universe_id"], name: "index_languages_on_universe_id" - add_index "languages", ["user_id"], name: "index_languages_on_user_id" - create_table "largest_cities_relationships", force: :cascade do |t| t.integer "user_id" t.integer "location_id" @@ -1171,47 +1106,44 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "location_capital_towns", force: :cascade do |t| - t.integer "location_id" - t.integer "capital_town_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "location_id" + t.integer "capital_town_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["location_id"], name: "index_location_capital_towns_on_location_id" + t.index ["user_id"], name: "index_location_capital_towns_on_user_id" end - add_index "location_capital_towns", ["location_id"], name: "index_location_capital_towns_on_location_id" - add_index "location_capital_towns", ["user_id"], name: "index_location_capital_towns_on_user_id" - create_table "location_landmarks", force: :cascade do |t| - t.integer "location_id" - t.integer "landmark_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "location_id" + t.integer "landmark_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["landmark_id"], name: "index_location_landmarks_on_landmark_id" + t.index ["location_id"], name: "index_location_landmarks_on_location_id" + t.index ["user_id"], name: "index_location_landmarks_on_user_id" end - add_index "location_landmarks", ["landmark_id"], name: "index_location_landmarks_on_landmark_id" - add_index "location_landmarks", ["location_id"], name: "index_location_landmarks_on_location_id" - add_index "location_landmarks", ["user_id"], name: "index_location_landmarks_on_user_id" - create_table "location_languageships", force: :cascade do |t| - t.integer "user_id" - t.integer "location_id" - t.integer "language_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "location_id" + t.integer "language_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "location_largest_towns", force: :cascade do |t| - t.integer "location_id" - t.integer "largest_town_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "location_id" + t.integer "largest_town_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["location_id"], name: "index_location_largest_towns_on_location_id" + t.index ["user_id"], name: "index_location_largest_towns_on_user_id" end - add_index "location_largest_towns", ["location_id"], name: "index_location_largest_towns_on_location_id" - add_index "location_largest_towns", ["user_id"], name: "index_location_largest_towns_on_user_id" - create_table "location_leaderships", force: :cascade do |t| t.integer "user_id" t.integer "location_id" @@ -1219,54 +1151,52 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "location_notable_towns", force: :cascade do |t| - t.integer "location_id" - t.integer "notable_town_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "location_id" + t.integer "notable_town_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["location_id"], name: "index_location_notable_towns_on_location_id" + t.index ["user_id"], name: "index_location_notable_towns_on_user_id" end - add_index "location_notable_towns", ["location_id"], name: "index_location_notable_towns_on_location_id" - add_index "location_notable_towns", ["user_id"], name: "index_location_notable_towns_on_user_id" - create_table "locations", force: :cascade do |t| - t.string "name", null: false - t.string "type_of" - t.text "description" - t.string "map_file_name" - t.string "map_content_type" - t.integer "map_file_size" + t.string "name", null: false + t.string "type_of" + t.text "description" + t.string "map_file_name" + t.string "map_content_type" + t.integer "map_file_size" t.datetime "map_updated_at" - t.string "population" - t.string "language" - t.string "currency" - t.string "motto" - t.text "capital" - t.text "largest_city" - t.text "notable_cities" - t.text "area" - t.text "crops" - t.text "located_at" - t.string "established_year" - t.text "notable_wars" - t.text "notes" - t.text "private_notes" - t.integer "user_id" - t.integer "universe_id" + t.string "population" + t.string "language" + t.string "currency" + t.string "motto" + t.text "capital" + t.text "largest_city" + t.text "notable_cities" + t.text "area" + t.text "crops" + t.text "located_at" + t.string "established_year" + t.text "notable_wars" + t.text "notes" + t.text "private_notes" + t.integer "user_id" + t.integer "universe_id" t.datetime "created_at" t.datetime "updated_at" - t.string "privacy", default: "private", null: false - t.string "laws" - t.string "climate" - t.string "founding_story" - t.string "sports" + t.string "privacy", default: "private", null: false + t.string "laws" + t.string "climate" + t.string "founding_story" + t.string "sports" t.datetime "deleted_at" + t.index ["deleted_at"], name: "index_locations_on_deleted_at" + t.index ["universe_id"], name: "index_locations_on_universe_id" + t.index ["user_id"], name: "index_locations_on_user_id" end - add_index "locations", ["deleted_at"], name: "index_locations_on_deleted_at" - add_index "locations", ["universe_id"], name: "index_locations_on_universe_id" - add_index "locations", ["user_id"], name: "index_locations_on_user_id" - create_table "magic_deityships", force: :cascade do |t| t.integer "user_id" t.integer "magic_id" @@ -1274,33 +1204,32 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "magics", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "type_of" - t.integer "universe_id" - t.integer "user_id" - t.string "visuals" - t.string "effects" - t.string "positive_effects" - t.string "negative_effects" - t.string "neutral_effects" - t.string "element" - t.string "resource_costs" - t.string "materials" - t.string "skills_required" - t.string "limitations" - t.string "notes" - t.string "private_notes" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "privacy" + t.string "name" + t.string "description" + t.string "type_of" + t.integer "universe_id" + t.integer "user_id" + t.string "visuals" + t.string "effects" + t.string "positive_effects" + t.string "negative_effects" + t.string "neutral_effects" + t.string "element" + t.string "resource_costs" + t.string "materials" + t.string "skills_required" + t.string "limitations" + t.string "notes" + t.string "private_notes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "privacy" t.datetime "deleted_at" + t.index ["deleted_at"], name: "index_magics_on_deleted_at" + t.index ["universe_id"], name: "index_magics_on_universe_id" + t.index ["user_id"], name: "index_magics_on_user_id" end - add_index "magics", ["deleted_at"], name: "index_magics_on_deleted_at" - add_index "magics", ["universe_id"], name: "index_magics_on_universe_id" - add_index "magics", ["user_id"], name: "index_magics_on_user_id" - create_table "maker_relationships", force: :cascade do |t| t.integer "user_id" t.integer "item_id" @@ -1308,19 +1237,19 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "marriages", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "spouse_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "spouse_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "motherships", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "mother_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "mother_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "notable_cities_relationships", force: :cascade do |t| @@ -1342,51 +1271,48 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "ownerships", force: :cascade do |t| - t.integer "character_id" - t.integer "item_id" - t.integer "user_id" - t.boolean "favorite" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "character_id" + t.integer "item_id" + t.integer "user_id" + t.boolean "favorite" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "page_categories", force: :cascade do |t| - t.string "label" - t.integer "universe_id" - t.string "content_type" - t.string "icon" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "user_id" + t.string "label" + t.integer "universe_id" + t.string "content_type" + t.string "icon" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "user_id" + t.index ["universe_id", "content_type"], name: "index_page_categories_on_universe_id_and_content_type" + t.index ["universe_id"], name: "index_page_categories_on_universe_id" + t.index ["user_id"], name: "index_page_categories_on_user_id" end - add_index "page_categories", ["universe_id", "content_type"], name: "index_page_categories_on_universe_id_and_content_type" - add_index "page_categories", ["universe_id"], name: "index_page_categories_on_universe_id" - add_index "page_categories", ["user_id"], name: "index_page_categories_on_user_id" - create_table "page_field_values", force: :cascade do |t| - t.integer "page_field_id" - t.integer "page_id" - t.text "value" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "page_field_id" + t.integer "page_id" + t.text "value" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.datetime "deleted_at" + t.index ["page_field_id"], name: "index_page_field_values_on_page_field_id" + t.index ["user_id"], name: "index_page_field_values_on_user_id" end - add_index "page_field_values", ["page_field_id"], name: "index_page_field_values_on_page_field_id" - add_index "page_field_values", ["user_id"], name: "index_page_field_values_on_user_id" - create_table "page_fields", force: :cascade do |t| - t.string "label" - t.integer "page_category_id" - t.string "field_type", default: "textarea" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.string "label" + t.integer "page_category_id" + t.string "field_type", default: "textarea" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["page_category_id"], name: "index_page_fields_on_page_category_id" end - add_index "page_fields", ["page_category_id"], name: "index_page_fields_on_page_category_id" - create_table "past_ownerships", force: :cascade do |t| t.integer "user_id" t.integer "item_id" @@ -1394,212 +1320,198 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "planet_countries", force: :cascade do |t| - t.integer "user_id" - t.integer "planet_id" - t.integer "country_id" + t.integer "user_id" + t.integer "planet_id" + t.integer "country_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["country_id"], name: "index_planet_countries_on_country_id" + t.index ["planet_id"], name: "index_planet_countries_on_planet_id" + t.index ["user_id"], name: "index_planet_countries_on_user_id" end - add_index "planet_countries", ["country_id"], name: "index_planet_countries_on_country_id" - add_index "planet_countries", ["planet_id"], name: "index_planet_countries_on_planet_id" - add_index "planet_countries", ["user_id"], name: "index_planet_countries_on_user_id" - create_table "planet_creatures", force: :cascade do |t| - t.integer "user_id" - t.integer "planet_id" - t.integer "creature_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "planet_id" + t.integer "creature_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["creature_id"], name: "index_planet_creatures_on_creature_id" + t.index ["planet_id"], name: "index_planet_creatures_on_planet_id" + t.index ["user_id"], name: "index_planet_creatures_on_user_id" end - add_index "planet_creatures", ["creature_id"], name: "index_planet_creatures_on_creature_id" - add_index "planet_creatures", ["planet_id"], name: "index_planet_creatures_on_planet_id" - add_index "planet_creatures", ["user_id"], name: "index_planet_creatures_on_user_id" - create_table "planet_deities", force: :cascade do |t| - t.integer "user_id" - t.integer "planet_id" - t.integer "deity_id" + t.integer "user_id" + t.integer "planet_id" + t.integer "deity_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["deity_id"], name: "index_planet_deities_on_deity_id" + t.index ["planet_id"], name: "index_planet_deities_on_planet_id" + t.index ["user_id"], name: "index_planet_deities_on_user_id" end - add_index "planet_deities", ["deity_id"], name: "index_planet_deities_on_deity_id" - add_index "planet_deities", ["planet_id"], name: "index_planet_deities_on_planet_id" - add_index "planet_deities", ["user_id"], name: "index_planet_deities_on_user_id" - create_table "planet_floras", force: :cascade do |t| - t.integer "user_id" - t.integer "planet_id" - t.integer "flora_id" + t.integer "user_id" + t.integer "planet_id" + t.integer "flora_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["flora_id"], name: "index_planet_floras_on_flora_id" + t.index ["planet_id"], name: "index_planet_floras_on_planet_id" + t.index ["user_id"], name: "index_planet_floras_on_user_id" end - add_index "planet_floras", ["flora_id"], name: "index_planet_floras_on_flora_id" - add_index "planet_floras", ["planet_id"], name: "index_planet_floras_on_planet_id" - add_index "planet_floras", ["user_id"], name: "index_planet_floras_on_user_id" - create_table "planet_groups", force: :cascade do |t| - t.integer "user_id" - t.integer "planet_id" - t.integer "group_id" + t.integer "user_id" + t.integer "planet_id" + t.integer "group_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["group_id"], name: "index_planet_groups_on_group_id" + t.index ["planet_id"], name: "index_planet_groups_on_planet_id" + t.index ["user_id"], name: "index_planet_groups_on_user_id" end - add_index "planet_groups", ["group_id"], name: "index_planet_groups_on_group_id" - add_index "planet_groups", ["planet_id"], name: "index_planet_groups_on_planet_id" - add_index "planet_groups", ["user_id"], name: "index_planet_groups_on_user_id" - create_table "planet_landmarks", force: :cascade do |t| - t.integer "user_id" - t.integer "planet_id" - t.integer "landmark_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "planet_id" + t.integer "landmark_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["landmark_id"], name: "index_planet_landmarks_on_landmark_id" + t.index ["planet_id"], name: "index_planet_landmarks_on_planet_id" + t.index ["user_id"], name: "index_planet_landmarks_on_user_id" end - add_index "planet_landmarks", ["landmark_id"], name: "index_planet_landmarks_on_landmark_id" - add_index "planet_landmarks", ["planet_id"], name: "index_planet_landmarks_on_planet_id" - add_index "planet_landmarks", ["user_id"], name: "index_planet_landmarks_on_user_id" - create_table "planet_languages", force: :cascade do |t| - t.integer "user_id" - t.integer "planet_id" - t.integer "language_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "planet_id" + t.integer "language_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["language_id"], name: "index_planet_languages_on_language_id" + t.index ["planet_id"], name: "index_planet_languages_on_planet_id" + t.index ["user_id"], name: "index_planet_languages_on_user_id" end - add_index "planet_languages", ["language_id"], name: "index_planet_languages_on_language_id" - add_index "planet_languages", ["planet_id"], name: "index_planet_languages_on_planet_id" - add_index "planet_languages", ["user_id"], name: "index_planet_languages_on_user_id" - create_table "planet_locations", force: :cascade do |t| - t.integer "user_id" - t.integer "planet_id" - t.integer "location_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "planet_id" + t.integer "location_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["location_id"], name: "index_planet_locations_on_location_id" + t.index ["planet_id"], name: "index_planet_locations_on_planet_id" + t.index ["user_id"], name: "index_planet_locations_on_user_id" end - add_index "planet_locations", ["location_id"], name: "index_planet_locations_on_location_id" - add_index "planet_locations", ["planet_id"], name: "index_planet_locations_on_planet_id" - add_index "planet_locations", ["user_id"], name: "index_planet_locations_on_user_id" - create_table "planet_nearby_planets", force: :cascade do |t| - t.integer "user_id" - t.integer "planet_id" - t.integer "nearby_planet_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "planet_id" + t.integer "nearby_planet_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["planet_id"], name: "index_planet_nearby_planets_on_planet_id" + t.index ["user_id"], name: "index_planet_nearby_planets_on_user_id" end - add_index "planet_nearby_planets", ["planet_id"], name: "index_planet_nearby_planets_on_planet_id" - add_index "planet_nearby_planets", ["user_id"], name: "index_planet_nearby_planets_on_user_id" - create_table "planet_races", force: :cascade do |t| - t.integer "user_id" - t.integer "planet_id" - t.integer "race_id" + t.integer "user_id" + t.integer "planet_id" + t.integer "race_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["planet_id"], name: "index_planet_races_on_planet_id" + t.index ["race_id"], name: "index_planet_races_on_race_id" + t.index ["user_id"], name: "index_planet_races_on_user_id" end - add_index "planet_races", ["planet_id"], name: "index_planet_races_on_planet_id" - add_index "planet_races", ["race_id"], name: "index_planet_races_on_race_id" - add_index "planet_races", ["user_id"], name: "index_planet_races_on_user_id" - create_table "planet_religions", force: :cascade do |t| - t.integer "user_id" - t.integer "planet_id" - t.integer "religion_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "planet_religions", ["planet_id"], name: "index_planet_religions_on_planet_id" - add_index "planet_religions", ["religion_id"], name: "index_planet_religions_on_religion_id" - add_index "planet_religions", ["user_id"], name: "index_planet_religions_on_user_id" - - create_table "planet_towns", force: :cascade do |t| - t.integer "user_id" - t.integer "planet_id" - t.integer "town_id" + t.integer "user_id" + t.integer "planet_id" + t.integer "religion_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["planet_id"], name: "index_planet_religions_on_planet_id" + t.index ["religion_id"], name: "index_planet_religions_on_religion_id" + t.index ["user_id"], name: "index_planet_religions_on_user_id" end - add_index "planet_towns", ["planet_id"], name: "index_planet_towns_on_planet_id" - add_index "planet_towns", ["town_id"], name: "index_planet_towns_on_town_id" - add_index "planet_towns", ["user_id"], name: "index_planet_towns_on_user_id" + create_table "planet_towns", force: :cascade do |t| + t.integer "user_id" + t.integer "planet_id" + t.integer "town_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["planet_id"], name: "index_planet_towns_on_planet_id" + t.index ["town_id"], name: "index_planet_towns_on_town_id" + t.index ["user_id"], name: "index_planet_towns_on_user_id" + end create_table "planets", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "size" - t.string "surface" - t.string "climate" - t.string "weather" - t.string "water_content" - t.string "natural_resources" - t.string "length_of_day" - t.string "length_of_night" - t.string "calendar_system" - t.string "population" - t.string "moons" - t.string "orbit" - t.string "visible_constellations" - t.string "first_inhabitants_story" - t.string "world_history" - t.string "private_notes" - t.string "privacy" - t.integer "universe_id" - t.integer "user_id" + t.string "name" + t.string "description" + t.string "size" + t.string "surface" + t.string "climate" + t.string "weather" + t.string "water_content" + t.string "natural_resources" + t.string "length_of_day" + t.string "length_of_night" + t.string "calendar_system" + t.string "population" + t.string "moons" + t.string "orbit" + t.string "visible_constellations" + t.string "first_inhabitants_story" + t.string "world_history" + t.string "private_notes" + t.string "privacy" + t.integer "universe_id" + t.integer "user_id" t.datetime "deleted_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "notes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "notes" + t.index ["universe_id"], name: "index_planets_on_universe_id" + t.index ["user_id"], name: "index_planets_on_user_id" end - add_index "planets", ["universe_id"], name: "index_planets_on_universe_id" - add_index "planets", ["user_id"], name: "index_planets_on_user_id" - create_table "races", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "other_names" - t.integer "universe_id" - t.integer "user_id" - t.string "body_shape" - t.string "skin_colors" - t.string "height" - t.string "weight" - t.string "notable_features" - t.string "variance" - t.string "clothing" - t.string "strengths" - t.string "weaknesses" - t.string "traditions" - t.string "beliefs" - t.string "governments" - t.string "technologies" - t.string "occupations" - t.string "economics" - t.string "favorite_foods" - t.string "notable_events" - t.string "notes" - t.string "private_notes" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "privacy" + t.string "name" + t.string "description" + t.string "other_names" + t.integer "universe_id" + t.integer "user_id" + t.string "body_shape" + t.string "skin_colors" + t.string "height" + t.string "weight" + t.string "notable_features" + t.string "variance" + t.string "clothing" + t.string "strengths" + t.string "weaknesses" + t.string "traditions" + t.string "beliefs" + t.string "governments" + t.string "technologies" + t.string "occupations" + t.string "economics" + t.string "favorite_foods" + t.string "notable_events" + t.string "notes" + t.string "private_notes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "privacy" t.datetime "deleted_at" + t.index ["deleted_at"], name: "index_races_on_deleted_at" end - add_index "races", ["deleted_at"], name: "index_races_on_deleted_at" - create_table "raceships", force: :cascade do |t| t.integer "user_id" t.integer "character_id" @@ -1607,58 +1519,55 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "raffle_entries", force: :cascade do |t| - t.integer "user_id" + t.integer "user_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_raffle_entries_on_user_id" end - add_index "raffle_entries", ["user_id"], name: "index_raffle_entries_on_user_id" - create_table "referral_codes", force: :cascade do |t| - t.integer "user_id" - t.string "code" + t.integer "user_id" + t.string "code" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_referral_codes_on_user_id" end - add_index "referral_codes", ["user_id"], name: "index_referral_codes_on_user_id" - create_table "referrals", force: :cascade do |t| - t.integer "referrer_id" - t.integer "referred_id" - t.integer "associated_code_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "referrer_id" + t.integer "referred_id" + t.integer "associated_code_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "religions", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "other_names" - t.integer "universe_id" - t.integer "user_id" - t.string "origin_story" - t.string "teachings" - t.string "prophecies" - t.string "places_of_worship" - t.string "worship_services" - t.string "obligations" - t.string "paradise" - t.string "initiation" - t.string "rituals" - t.string "holidays" - t.string "notes" - t.string "private_notes" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "privacy" + t.string "name" + t.string "description" + t.string "other_names" + t.integer "universe_id" + t.integer "user_id" + t.string "origin_story" + t.string "teachings" + t.string "prophecies" + t.string "places_of_worship" + t.string "worship_services" + t.string "obligations" + t.string "paradise" + t.string "initiation" + t.string "rituals" + t.string "holidays" + t.string "notes" + t.string "private_notes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "privacy" t.datetime "deleted_at" + t.index ["deleted_at"], name: "index_religions_on_deleted_at" + t.index ["universe_id"], name: "index_religions_on_universe_id" + t.index ["user_id"], name: "index_religions_on_user_id" end - add_index "religions", ["deleted_at"], name: "index_religions_on_deleted_at" - add_index "religions", ["universe_id"], name: "index_religions_on_universe_id" - add_index "religions", ["user_id"], name: "index_religions_on_user_id" - create_table "religious_figureships", force: :cascade do |t| t.integer "religion_id" t.integer "user_id" @@ -1696,40 +1605,39 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "scenes", force: :cascade do |t| - t.integer "scene_number" - t.string "name" - t.string "summary" - t.integer "universe_id" - t.integer "user_id" - t.string "cause" - t.string "description" - t.string "results" - t.string "prose" - t.string "notes" - t.string "private_notes" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "privacy" + t.integer "scene_number" + t.string "name" + t.string "summary" + t.integer "universe_id" + t.integer "user_id" + t.string "cause" + t.string "description" + t.string "results" + t.string "prose" + t.string "notes" + t.string "private_notes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "privacy" t.datetime "deleted_at" + t.index ["deleted_at"], name: "index_scenes_on_deleted_at" + t.index ["universe_id"], name: "index_scenes_on_universe_id" + t.index ["user_id"], name: "index_scenes_on_user_id" end - add_index "scenes", ["deleted_at"], name: "index_scenes_on_deleted_at" - add_index "scenes", ["universe_id"], name: "index_scenes_on_universe_id" - add_index "scenes", ["user_id"], name: "index_scenes_on_user_id" - create_table "sessions", force: :cascade do |t| - t.string "username", null: false - t.string "password", null: false + t.string "username", null: false + t.string "password", null: false t.datetime "created_at" t.datetime "updated_at" end create_table "siblingships", force: :cascade do |t| - t.integer "user_id" - t.integer "character_id" - t.integer "sibling_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "character_id" + t.integer "sibling_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "sistergroupships", force: :cascade do |t| @@ -1739,8 +1647,8 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "stripe_event_logs", force: :cascade do |t| - t.string "event_id" - t.string "event_type" + t.string "event_id" + t.string "event_type" t.datetime "created_at", null: false t.datetime "updated_at", null: false end @@ -1752,17 +1660,16 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "subscriptions", force: :cascade do |t| - t.integer "user_id" - t.integer "billing_plan_id" + t.integer "user_id" + t.integer "billing_plan_id" t.datetime "start_date" t.datetime "end_date" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["billing_plan_id"], name: "index_subscriptions_on_billing_plan_id" + t.index ["user_id"], name: "index_subscriptions_on_user_id" end - add_index "subscriptions", ["billing_plan_id"], name: "index_subscriptions_on_billing_plan_id" - add_index "subscriptions", ["user_id"], name: "index_subscriptions_on_user_id" - create_table "supergroupships", force: :cascade do |t| t.integer "user_id" t.integer "group_id" @@ -1770,576 +1677,533 @@ ActiveRecord::Schema.define(version: 20180620012919) do end create_table "technologies", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "other_names" - t.string "materials" - t.string "manufacturing_process" - t.string "sales_process" - t.string "cost" - t.string "rarity" - t.string "purpose" - t.string "how_it_works" - t.string "resources_used" - t.string "physical_description" - t.string "size" - t.string "weight" - t.string "colors" - t.string "notes" - t.string "private_notes" - t.string "privacy" - t.integer "user_id" - t.integer "universe_id" + t.string "name" + t.string "description" + t.string "other_names" + t.string "materials" + t.string "manufacturing_process" + t.string "sales_process" + t.string "cost" + t.string "rarity" + t.string "purpose" + t.string "how_it_works" + t.string "resources_used" + t.string "physical_description" + t.string "size" + t.string "weight" + t.string "colors" + t.string "notes" + t.string "private_notes" + t.string "privacy" + t.integer "user_id" + t.integer "universe_id" t.datetime "deleted_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["universe_id"], name: "index_technologies_on_universe_id" + t.index ["user_id"], name: "index_technologies_on_user_id" end - add_index "technologies", ["universe_id"], name: "index_technologies_on_universe_id" - add_index "technologies", ["user_id"], name: "index_technologies_on_user_id" - create_table "technology_characters", force: :cascade do |t| - t.integer "user_id" - t.integer "technology_id" - t.integer "character_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "technology_id" + t.integer "character_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["character_id"], name: "index_technology_characters_on_character_id" + t.index ["technology_id"], name: "index_technology_characters_on_technology_id" + t.index ["user_id"], name: "index_technology_characters_on_user_id" end - add_index "technology_characters", ["character_id"], name: "index_technology_characters_on_character_id" - add_index "technology_characters", ["technology_id"], name: "index_technology_characters_on_technology_id" - add_index "technology_characters", ["user_id"], name: "index_technology_characters_on_user_id" - create_table "technology_child_technologies", force: :cascade do |t| - t.integer "user_id" - t.integer "technology_id" - t.integer "child_technology_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "technology_id" + t.integer "child_technology_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["technology_id"], name: "index_technology_child_technologies_on_technology_id" + t.index ["user_id"], name: "index_technology_child_technologies_on_user_id" end - add_index "technology_child_technologies", ["technology_id"], name: "index_technology_child_technologies_on_technology_id" - add_index "technology_child_technologies", ["user_id"], name: "index_technology_child_technologies_on_user_id" - create_table "technology_countries", force: :cascade do |t| - t.integer "user_id" - t.integer "technology_id" - t.integer "country_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "technology_id" + t.integer "country_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["country_id"], name: "index_technology_countries_on_country_id" + t.index ["technology_id"], name: "index_technology_countries_on_technology_id" + t.index ["user_id"], name: "index_technology_countries_on_user_id" end - add_index "technology_countries", ["country_id"], name: "index_technology_countries_on_country_id" - add_index "technology_countries", ["technology_id"], name: "index_technology_countries_on_technology_id" - add_index "technology_countries", ["user_id"], name: "index_technology_countries_on_user_id" - create_table "technology_creatures", force: :cascade do |t| - t.integer "user_id" - t.integer "technology_id" - t.integer "creature_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "technology_id" + t.integer "creature_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["creature_id"], name: "index_technology_creatures_on_creature_id" + t.index ["technology_id"], name: "index_technology_creatures_on_technology_id" + t.index ["user_id"], name: "index_technology_creatures_on_user_id" end - add_index "technology_creatures", ["creature_id"], name: "index_technology_creatures_on_creature_id" - add_index "technology_creatures", ["technology_id"], name: "index_technology_creatures_on_technology_id" - add_index "technology_creatures", ["user_id"], name: "index_technology_creatures_on_user_id" - create_table "technology_groups", force: :cascade do |t| - t.integer "user_id" - t.integer "technology_id" - t.integer "group_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "technology_id" + t.integer "group_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["group_id"], name: "index_technology_groups_on_group_id" + t.index ["technology_id"], name: "index_technology_groups_on_technology_id" + t.index ["user_id"], name: "index_technology_groups_on_user_id" end - add_index "technology_groups", ["group_id"], name: "index_technology_groups_on_group_id" - add_index "technology_groups", ["technology_id"], name: "index_technology_groups_on_technology_id" - add_index "technology_groups", ["user_id"], name: "index_technology_groups_on_user_id" - create_table "technology_magics", force: :cascade do |t| - t.integer "user_id" - t.integer "technology_id" - t.integer "magic_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "technology_id" + t.integer "magic_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["magic_id"], name: "index_technology_magics_on_magic_id" + t.index ["technology_id"], name: "index_technology_magics_on_technology_id" + t.index ["user_id"], name: "index_technology_magics_on_user_id" end - add_index "technology_magics", ["magic_id"], name: "index_technology_magics_on_magic_id" - add_index "technology_magics", ["technology_id"], name: "index_technology_magics_on_technology_id" - add_index "technology_magics", ["user_id"], name: "index_technology_magics_on_user_id" - create_table "technology_parent_technologies", force: :cascade do |t| - t.integer "user_id" - t.integer "technology_id" - t.integer "parent_technology_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "technology_id" + t.integer "parent_technology_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["technology_id"], name: "index_technology_parent_technologies_on_technology_id" + t.index ["user_id"], name: "index_technology_parent_technologies_on_user_id" end - add_index "technology_parent_technologies", ["technology_id"], name: "index_technology_parent_technologies_on_technology_id" - add_index "technology_parent_technologies", ["user_id"], name: "index_technology_parent_technologies_on_user_id" - create_table "technology_planets", force: :cascade do |t| - t.integer "user_id" - t.integer "technology_id" - t.integer "planet_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "technology_id" + t.integer "planet_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["planet_id"], name: "index_technology_planets_on_planet_id" + t.index ["technology_id"], name: "index_technology_planets_on_technology_id" + t.index ["user_id"], name: "index_technology_planets_on_user_id" end - add_index "technology_planets", ["planet_id"], name: "index_technology_planets_on_planet_id" - add_index "technology_planets", ["technology_id"], name: "index_technology_planets_on_technology_id" - add_index "technology_planets", ["user_id"], name: "index_technology_planets_on_user_id" - create_table "technology_related_technologies", force: :cascade do |t| - t.integer "user_id" - t.integer "technology_id" - t.integer "related_technology_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "technology_id" + t.integer "related_technology_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["technology_id"], name: "index_technology_related_technologies_on_technology_id" + t.index ["user_id"], name: "index_technology_related_technologies_on_user_id" end - add_index "technology_related_technologies", ["technology_id"], name: "index_technology_related_technologies_on_technology_id" - add_index "technology_related_technologies", ["user_id"], name: "index_technology_related_technologies_on_user_id" - create_table "technology_towns", force: :cascade do |t| - t.integer "user_id" - t.integer "technology_id" - t.integer "town_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "technology_id" + t.integer "town_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["technology_id"], name: "index_technology_towns_on_technology_id" + t.index ["town_id"], name: "index_technology_towns_on_town_id" + t.index ["user_id"], name: "index_technology_towns_on_user_id" end - add_index "technology_towns", ["technology_id"], name: "index_technology_towns_on_technology_id" - add_index "technology_towns", ["town_id"], name: "index_technology_towns_on_town_id" - add_index "technology_towns", ["user_id"], name: "index_technology_towns_on_user_id" - create_table "thredded_categories", force: :cascade do |t| - t.integer "messageboard_id", null: false - t.text "name", null: false - t.text "description" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.text "slug", null: false + t.integer "messageboard_id", null: false + t.text "name", null: false + t.text "description" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.text "slug", null: false + t.index ["messageboard_id", "slug"], name: "index_thredded_categories_on_messageboard_id_and_slug", unique: true + t.index ["messageboard_id"], name: "index_thredded_categories_on_messageboard_id" + t.index ["name"], name: "thredded_categories_name_ci" end - add_index "thredded_categories", ["messageboard_id", "slug"], name: "index_thredded_categories_on_messageboard_id_and_slug", unique: true - add_index "thredded_categories", ["messageboard_id"], name: "index_thredded_categories_on_messageboard_id" - add_index "thredded_categories", ["name"], name: "thredded_categories_name_ci" - create_table "thredded_messageboard_groups", force: :cascade do |t| - t.string "name" - t.integer "position", null: false + t.string "name" + t.integer "position", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false end create_table "thredded_messageboard_notifications_for_followed_topics", force: :cascade do |t| - t.integer "user_id", null: false - t.integer "messageboard_id", null: false - t.string "notifier_key", limit: 90, null: false - t.boolean "enabled", default: true, null: false + t.integer "user_id", null: false + t.integer "messageboard_id", null: false + t.string "notifier_key", limit: 90, null: false + t.boolean "enabled", default: true, null: false + t.index ["user_id", "messageboard_id", "notifier_key"], name: "thredded_messageboard_notifications_for_followed_topics_unique", unique: true end - add_index "thredded_messageboard_notifications_for_followed_topics", ["user_id", "messageboard_id", "notifier_key"], name: "thredded_messageboard_notifications_for_followed_topics_unique", unique: true - create_table "thredded_messageboard_users", force: :cascade do |t| - t.integer "thredded_user_detail_id", null: false - t.integer "thredded_messageboard_id", null: false - t.datetime "last_seen_at", null: false + t.integer "thredded_user_detail_id", null: false + t.integer "thredded_messageboard_id", null: false + t.datetime "last_seen_at", null: false + t.index ["thredded_messageboard_id", "last_seen_at"], name: "index_thredded_messageboard_users_for_recently_active" + t.index ["thredded_messageboard_id", "thredded_user_detail_id"], name: "index_thredded_messageboard_users_primary", unique: true end - add_index "thredded_messageboard_users", ["thredded_messageboard_id", "last_seen_at"], name: "index_thredded_messageboard_users_for_recently_active" - add_index "thredded_messageboard_users", ["thredded_messageboard_id", "thredded_user_detail_id"], name: "index_thredded_messageboard_users_primary", unique: true - create_table "thredded_messageboards", force: :cascade do |t| - t.text "name", null: false - t.text "slug" - t.text "description" - t.integer "topics_count", default: 0 - t.integer "posts_count", default: 0 - t.integer "position", null: false - t.integer "last_topic_id" - t.integer "messageboard_group_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.boolean "locked", default: false, null: false + t.text "name", null: false + t.text "slug" + t.text "description" + t.integer "topics_count", default: 0 + t.integer "posts_count", default: 0 + t.integer "position", null: false + t.integer "last_topic_id" + t.integer "messageboard_group_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "locked", default: false, null: false + t.index ["messageboard_group_id"], name: "index_thredded_messageboards_on_messageboard_group_id" + t.index ["slug"], name: "index_thredded_messageboards_on_slug", unique: true end - add_index "thredded_messageboards", ["messageboard_group_id"], name: "index_thredded_messageboards_on_messageboard_group_id" - add_index "thredded_messageboards", ["slug"], name: "index_thredded_messageboards_on_slug", unique: true - create_table "thredded_notifications_for_followed_topics", force: :cascade do |t| - t.integer "user_id", null: false - t.string "notifier_key", limit: 90, null: false - t.boolean "enabled", default: true, null: false + t.integer "user_id", null: false + t.string "notifier_key", limit: 90, null: false + t.boolean "enabled", default: true, null: false + t.index ["user_id", "notifier_key"], name: "thredded_notifications_for_followed_topics_unique", unique: true end - add_index "thredded_notifications_for_followed_topics", ["user_id", "notifier_key"], name: "thredded_notifications_for_followed_topics_unique", unique: true - create_table "thredded_notifications_for_private_topics", force: :cascade do |t| - t.integer "user_id", null: false - t.string "notifier_key", limit: 90, null: false - t.boolean "enabled", default: true, null: false + t.integer "user_id", null: false + t.string "notifier_key", limit: 90, null: false + t.boolean "enabled", default: true, null: false + t.index ["user_id", "notifier_key"], name: "thredded_notifications_for_private_topics_unique", unique: true end - add_index "thredded_notifications_for_private_topics", ["user_id", "notifier_key"], name: "thredded_notifications_for_private_topics_unique", unique: true - create_table "thredded_post_moderation_records", force: :cascade do |t| - t.integer "post_id" - t.integer "messageboard_id" - t.text "post_content", limit: 65535 - t.integer "post_user_id" - t.text "post_user_name" - t.integer "moderator_id" - t.integer "moderation_state", null: false - t.integer "previous_moderation_state", null: false - t.datetime "created_at", null: false + t.integer "post_id" + t.integer "messageboard_id" + t.text "post_content", limit: 65535 + t.integer "post_user_id" + t.text "post_user_name" + t.integer "moderator_id" + t.integer "moderation_state", null: false + t.integer "previous_moderation_state", null: false + t.datetime "created_at", null: false + t.index ["messageboard_id", "created_at"], name: "index_thredded_moderation_records_for_display" end - add_index "thredded_post_moderation_records", ["messageboard_id", "created_at"], name: "index_thredded_moderation_records_for_display" - create_table "thredded_posts", force: :cascade do |t| - t.integer "user_id" - t.text "content", limit: 65535 - t.string "source", limit: 191, default: "web" - t.integer "postable_id", null: false - t.integer "messageboard_id", null: false - t.integer "moderation_state", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.text "content", limit: 65535 + t.string "source", limit: 191, default: "web" + t.integer "postable_id", null: false + t.integer "messageboard_id", null: false + t.integer "moderation_state", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["messageboard_id"], name: "index_thredded_posts_on_messageboard_id" + t.index ["moderation_state", "updated_at"], name: "index_thredded_posts_for_display" + t.index ["postable_id"], name: "index_thredded_posts_on_postable_id_and_postable_type" + t.index ["user_id"], name: "index_thredded_posts_on_user_id" end - add_index "thredded_posts", ["messageboard_id"], name: "index_thredded_posts_on_messageboard_id" - add_index "thredded_posts", ["moderation_state", "updated_at"], name: "index_thredded_posts_for_display" - add_index "thredded_posts", ["postable_id"], name: "index_thredded_posts_on_postable_id_and_postable_type" - add_index "thredded_posts", ["user_id"], name: "index_thredded_posts_on_user_id" - create_table "thredded_private_posts", force: :cascade do |t| - t.integer "user_id" - t.text "content", limit: 65535 - t.integer "postable_id", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.text "content", limit: 65535 + t.integer "postable_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["postable_id", "created_at"], name: "index_thredded_private_posts_on_postable_id_and_created_at" end - add_index "thredded_private_posts", ["postable_id", "created_at"], name: "index_thredded_private_posts_on_postable_id_and_created_at" - create_table "thredded_private_topics", force: :cascade do |t| - t.integer "user_id" - t.integer "last_user_id" - t.text "title", null: false - t.text "slug", null: false - t.integer "posts_count", default: 0 - t.string "hash_id", limit: 20, null: false + t.integer "user_id" + t.integer "last_user_id" + t.text "title", null: false + t.text "slug", null: false + t.integer "posts_count", default: 0 + t.string "hash_id", limit: 20, null: false t.datetime "last_post_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["hash_id"], name: "index_thredded_private_topics_on_hash_id" + t.index ["last_post_at"], name: "index_thredded_private_topics_on_last_post_at" + t.index ["slug"], name: "index_thredded_private_topics_on_slug", unique: true end - add_index "thredded_private_topics", ["hash_id"], name: "index_thredded_private_topics_on_hash_id" - add_index "thredded_private_topics", ["last_post_at"], name: "index_thredded_private_topics_on_last_post_at" - add_index "thredded_private_topics", ["slug"], name: "index_thredded_private_topics_on_slug", unique: true - create_table "thredded_private_users", force: :cascade do |t| - t.integer "private_topic_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "private_topic_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["private_topic_id"], name: "index_thredded_private_users_on_private_topic_id" + t.index ["user_id"], name: "index_thredded_private_users_on_user_id" end - add_index "thredded_private_users", ["private_topic_id"], name: "index_thredded_private_users_on_private_topic_id" - add_index "thredded_private_users", ["user_id"], name: "index_thredded_private_users_on_user_id" - create_table "thredded_topic_categories", force: :cascade do |t| - t.integer "topic_id", null: false + t.integer "topic_id", null: false t.integer "category_id", null: false + t.index ["category_id"], name: "index_thredded_topic_categories_on_category_id" + t.index ["topic_id"], name: "index_thredded_topic_categories_on_topic_id" end - add_index "thredded_topic_categories", ["category_id"], name: "index_thredded_topic_categories_on_category_id" - add_index "thredded_topic_categories", ["topic_id"], name: "index_thredded_topic_categories_on_topic_id" - create_table "thredded_topics", force: :cascade do |t| - t.integer "user_id" - t.integer "last_user_id" - t.text "title", null: false - t.text "slug", null: false - t.integer "messageboard_id", null: false - t.integer "posts_count", default: 0, null: false - t.boolean "sticky", default: false, null: false - t.boolean "locked", default: false, null: false - t.string "hash_id", limit: 20, null: false - t.integer "moderation_state", null: false + t.integer "user_id" + t.integer "last_user_id" + t.text "title", null: false + t.text "slug", null: false + t.integer "messageboard_id", null: false + t.integer "posts_count", default: 0, null: false + t.boolean "sticky", default: false, null: false + t.boolean "locked", default: false, null: false + t.string "hash_id", limit: 20, null: false + t.integer "moderation_state", null: false t.datetime "last_post_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["hash_id"], name: "index_thredded_topics_on_hash_id" + t.index ["last_post_at"], name: "index_thredded_topics_on_last_post_at" + t.index ["messageboard_id"], name: "index_thredded_topics_on_messageboard_id" + t.index ["moderation_state", "sticky", "updated_at"], name: "index_thredded_topics_for_display" + t.index ["slug"], name: "index_thredded_topics_on_slug", unique: true + t.index ["user_id"], name: "index_thredded_topics_on_user_id" end - add_index "thredded_topics", ["hash_id"], name: "index_thredded_topics_on_hash_id" - add_index "thredded_topics", ["last_post_at"], name: "index_thredded_topics_on_last_post_at" - add_index "thredded_topics", ["messageboard_id"], name: "index_thredded_topics_on_messageboard_id" - add_index "thredded_topics", ["moderation_state", "sticky", "updated_at"], name: "index_thredded_topics_for_display" - add_index "thredded_topics", ["slug"], name: "index_thredded_topics_on_slug", unique: true - add_index "thredded_topics", ["user_id"], name: "index_thredded_topics_on_user_id" - create_table "thredded_user_details", force: :cascade do |t| - t.integer "user_id", null: false + t.integer "user_id", null: false t.datetime "latest_activity_at" - t.integer "posts_count", default: 0 - t.integer "topics_count", default: 0 + t.integer "posts_count", default: 0 + t.integer "topics_count", default: 0 t.datetime "last_seen_at" - t.integer "moderation_state", default: 0, null: false + t.integer "moderation_state", default: 0, null: false t.datetime "moderation_state_changed_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["latest_activity_at"], name: "index_thredded_user_details_on_latest_activity_at" + t.index ["moderation_state", "moderation_state_changed_at"], name: "index_thredded_user_details_for_moderations" + t.index ["user_id"], name: "index_thredded_user_details_on_user_id", unique: true end - add_index "thredded_user_details", ["latest_activity_at"], name: "index_thredded_user_details_on_latest_activity_at" - add_index "thredded_user_details", ["moderation_state", "moderation_state_changed_at"], name: "index_thredded_user_details_for_moderations" - add_index "thredded_user_details", ["user_id"], name: "index_thredded_user_details_on_user_id", unique: true - create_table "thredded_user_messageboard_preferences", force: :cascade do |t| - t.integer "user_id", null: false - t.integer "messageboard_id", null: false - t.boolean "follow_topics_on_mention", default: true, null: false - t.boolean "auto_follow_topics", default: false, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id", null: false + t.integer "messageboard_id", null: false + t.boolean "follow_topics_on_mention", default: true, null: false + t.boolean "auto_follow_topics", default: false, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["user_id", "messageboard_id"], name: "thredded_user_messageboard_preferences_user_id_messageboard_id", unique: true end - add_index "thredded_user_messageboard_preferences", ["user_id", "messageboard_id"], name: "thredded_user_messageboard_preferences_user_id_messageboard_id", unique: true - create_table "thredded_user_post_notifications", force: :cascade do |t| - t.integer "user_id", null: false - t.integer "post_id", null: false + t.integer "user_id", null: false + t.integer "post_id", null: false t.datetime "notified_at", null: false + t.index ["post_id"], name: "index_thredded_user_post_notifications_on_post_id" + t.index ["user_id", "post_id"], name: "index_thredded_user_post_notifications_on_user_id_and_post_id", unique: true end - add_index "thredded_user_post_notifications", ["post_id"], name: "index_thredded_user_post_notifications_on_post_id" - add_index "thredded_user_post_notifications", ["user_id", "post_id"], name: "index_thredded_user_post_notifications_on_user_id_and_post_id", unique: true - create_table "thredded_user_preferences", force: :cascade do |t| - t.integer "user_id", null: false - t.boolean "follow_topics_on_mention", default: true, null: false - t.boolean "auto_follow_topics", default: false, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id", null: false + t.boolean "follow_topics_on_mention", default: true, null: false + t.boolean "auto_follow_topics", default: false, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_thredded_user_preferences_on_user_id", unique: true end - add_index "thredded_user_preferences", ["user_id"], name: "index_thredded_user_preferences_on_user_id", unique: true - create_table "thredded_user_private_topic_read_states", force: :cascade do |t| - t.integer "user_id", null: false - t.integer "postable_id", null: false - t.datetime "read_at", null: false + t.integer "user_id", null: false + t.integer "postable_id", null: false + t.datetime "read_at", null: false + t.index ["user_id", "postable_id"], name: "thredded_user_private_topic_read_states_user_postable", unique: true end - add_index "thredded_user_private_topic_read_states", ["user_id", "postable_id"], name: "thredded_user_private_topic_read_states_user_postable", unique: true - create_table "thredded_user_topic_follows", force: :cascade do |t| - t.integer "user_id", null: false - t.integer "topic_id", null: false - t.datetime "created_at", null: false - t.integer "reason", limit: 1 + t.integer "user_id", null: false + t.integer "topic_id", null: false + t.datetime "created_at", null: false + t.integer "reason", limit: 1 + t.index ["user_id", "topic_id"], name: "thredded_user_topic_follows_user_topic", unique: true end - add_index "thredded_user_topic_follows", ["user_id", "topic_id"], name: "thredded_user_topic_follows_user_topic", unique: true - create_table "thredded_user_topic_read_states", force: :cascade do |t| - t.integer "user_id", null: false - t.integer "postable_id", null: false - t.datetime "read_at", null: false + t.integer "user_id", null: false + t.integer "postable_id", null: false + t.datetime "read_at", null: false + t.index ["user_id", "postable_id"], name: "thredded_user_topic_read_states_user_postable", unique: true end - add_index "thredded_user_topic_read_states", ["user_id", "postable_id"], name: "thredded_user_topic_read_states_user_postable", unique: true - create_table "town_citizens", force: :cascade do |t| - t.integer "user_id" - t.integer "town_id" - t.integer "citizen_id" + t.integer "user_id" + t.integer "town_id" + t.integer "citizen_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["town_id"], name: "index_town_citizens_on_town_id" + t.index ["user_id"], name: "index_town_citizens_on_user_id" end - add_index "town_citizens", ["town_id"], name: "index_town_citizens_on_town_id" - add_index "town_citizens", ["user_id"], name: "index_town_citizens_on_user_id" - create_table "town_countries", force: :cascade do |t| - t.integer "user_id" - t.integer "town_id" - t.integer "country_id" + t.integer "user_id" + t.integer "town_id" + t.integer "country_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["country_id"], name: "index_town_countries_on_country_id" + t.index ["town_id"], name: "index_town_countries_on_town_id" + t.index ["user_id"], name: "index_town_countries_on_user_id" end - add_index "town_countries", ["country_id"], name: "index_town_countries_on_country_id" - add_index "town_countries", ["town_id"], name: "index_town_countries_on_town_id" - add_index "town_countries", ["user_id"], name: "index_town_countries_on_user_id" - create_table "town_creatures", force: :cascade do |t| - t.integer "user_id" - t.integer "town_id" - t.integer "creature_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "town_id" + t.integer "creature_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["creature_id"], name: "index_town_creatures_on_creature_id" + t.index ["town_id"], name: "index_town_creatures_on_town_id" + t.index ["user_id"], name: "index_town_creatures_on_user_id" end - add_index "town_creatures", ["creature_id"], name: "index_town_creatures_on_creature_id" - add_index "town_creatures", ["town_id"], name: "index_town_creatures_on_town_id" - add_index "town_creatures", ["user_id"], name: "index_town_creatures_on_user_id" - create_table "town_floras", force: :cascade do |t| - t.integer "user_id" - t.integer "town_id" - t.integer "flora_id" + t.integer "user_id" + t.integer "town_id" + t.integer "flora_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["flora_id"], name: "index_town_floras_on_flora_id" + t.index ["town_id"], name: "index_town_floras_on_town_id" + t.index ["user_id"], name: "index_town_floras_on_user_id" end - add_index "town_floras", ["flora_id"], name: "index_town_floras_on_flora_id" - add_index "town_floras", ["town_id"], name: "index_town_floras_on_town_id" - add_index "town_floras", ["user_id"], name: "index_town_floras_on_user_id" - create_table "town_groups", force: :cascade do |t| - t.integer "user_id" - t.integer "town_id" - t.integer "group_id" + t.integer "user_id" + t.integer "town_id" + t.integer "group_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["group_id"], name: "index_town_groups_on_group_id" + t.index ["town_id"], name: "index_town_groups_on_town_id" + t.index ["user_id"], name: "index_town_groups_on_user_id" end - add_index "town_groups", ["group_id"], name: "index_town_groups_on_group_id" - add_index "town_groups", ["town_id"], name: "index_town_groups_on_town_id" - add_index "town_groups", ["user_id"], name: "index_town_groups_on_user_id" - create_table "town_languages", force: :cascade do |t| - t.integer "user_id" - t.integer "town_id" - t.integer "language_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "town_id" + t.integer "language_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["language_id"], name: "index_town_languages_on_language_id" + t.index ["town_id"], name: "index_town_languages_on_town_id" + t.index ["user_id"], name: "index_town_languages_on_user_id" end - add_index "town_languages", ["language_id"], name: "index_town_languages_on_language_id" - add_index "town_languages", ["town_id"], name: "index_town_languages_on_town_id" - add_index "town_languages", ["user_id"], name: "index_town_languages_on_user_id" - create_table "town_nearby_landmarks", force: :cascade do |t| - t.integer "user_id" - t.integer "town_id" - t.integer "nearby_landmark_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "town_id" + t.integer "nearby_landmark_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["town_id"], name: "index_town_nearby_landmarks_on_town_id" + t.index ["user_id"], name: "index_town_nearby_landmarks_on_user_id" end - add_index "town_nearby_landmarks", ["town_id"], name: "index_town_nearby_landmarks_on_town_id" - add_index "town_nearby_landmarks", ["user_id"], name: "index_town_nearby_landmarks_on_user_id" - create_table "towns", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "other_names" - t.string "laws" - t.string "sports" - t.string "politics" - t.string "founding_story" - t.string "established_year" - t.string "notes" - t.string "private_notes" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "universe_id" + t.string "name" + t.string "description" + t.string "other_names" + t.string "laws" + t.string "sports" + t.string "politics" + t.string "founding_story" + t.string "established_year" + t.string "notes" + t.string "private_notes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "universe_id" t.datetime "deleted_at" - t.string "privacy" - t.integer "user_id" + t.string "privacy" + t.integer "user_id" + t.index ["universe_id"], name: "index_towns_on_universe_id" + t.index ["user_id"], name: "index_towns_on_user_id" end - add_index "towns", ["universe_id"], name: "index_towns_on_universe_id" - add_index "towns", ["user_id"], name: "index_towns_on_user_id" - create_table "universes", force: :cascade do |t| - t.string "name", null: false - t.text "description" - t.text "history" - t.text "notes" - t.text "private_notes" - t.string "privacy" - t.integer "user_id" + t.string "name", null: false + t.text "description" + t.text "history" + t.text "notes" + t.text "private_notes" + t.string "privacy" + t.integer "user_id" t.datetime "created_at" t.datetime "updated_at" - t.string "laws_of_physics" - t.string "magic_system" - t.string "technology" - t.string "genre" + t.string "laws_of_physics" + t.string "magic_system" + t.string "technology" + t.string "genre" t.datetime "deleted_at" + t.index ["deleted_at"], name: "index_universes_on_deleted_at" + t.index ["user_id"], name: "index_universes_on_user_id" end - add_index "universes", ["deleted_at"], name: "index_universes_on_deleted_at" - add_index "universes", ["user_id"], name: "index_universes_on_user_id" - create_table "user_content_type_activators", force: :cascade do |t| - t.integer "user_id" - t.string "content_type" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "user_id" + t.string "content_type" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_user_content_type_activators_on_user_id" end - add_index "user_content_type_activators", ["user_id"], name: "index_user_content_type_activators_on_user_id" - create_table "users", force: :cascade do |t| - t.string "name" - t.string "email", null: false - t.string "old_password" + t.string "name" + t.string "email", null: false + t.string "old_password" t.datetime "created_at" t.datetime "updated_at" - t.string "encrypted_password", default: "", null: false - t.string "reset_password_token" + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" t.datetime "reset_password_sent_at" t.datetime "remember_created_at" - t.integer "sign_in_count", default: 0, null: false + t.integer "sign_in_count", default: 0, null: false t.datetime "current_sign_in_at" t.datetime "last_sign_in_at" - t.string "current_sign_in_ip" - t.string "last_sign_in_ip" - t.string "plan_type" - t.string "stripe_customer_id" - t.boolean "email_updates", default: true - t.integer "selected_billing_plan_id" - t.integer "upload_bandwidth_kb", default: 50000 - t.string "secure_code" - t.boolean "fluid_preference" - t.string "username" - t.boolean "forum_administrator", default: false, null: false + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.string "plan_type" + t.string "stripe_customer_id" + t.boolean "email_updates", default: true + t.integer "selected_billing_plan_id" + t.integer "upload_bandwidth_kb", default: 50000 + t.string "secure_code" + t.boolean "fluid_preference" + t.string "username" + t.boolean "forum_administrator", default: false, null: false t.datetime "deleted_at" - t.boolean "site_administrator", default: false - t.boolean "forum_moderator", default: false + t.boolean "site_administrator", default: false + t.boolean "forum_moderator", default: false + t.index ["deleted_at"], name: "index_users_on_deleted_at" + t.index ["email"], name: "index_users_on_email", unique: true + t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + t.index ["username"], name: "index_users_on_username", unique: true end - add_index "users", ["deleted_at"], name: "index_users_on_deleted_at" - add_index "users", ["email"], name: "index_users_on_email", unique: true - add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true - add_index "users", ["username"], name: "index_users_on_username", unique: true - create_table "votables", force: :cascade do |t| - t.string "name" - t.string "description" - t.string "icon" - t.string "link" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.string "name" + t.string "description" + t.string "icon" + t.string "link" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "votes", force: :cascade do |t| - t.integer "user_id" - t.integer "votable_id" + t.integer "user_id" + t.integer "votable_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_votes_on_user_id" + t.index ["votable_id"], name: "index_votes_on_votable_id" end - add_index "votes", ["user_id"], name: "index_votes_on_user_id" - add_index "votes", ["votable_id"], name: "index_votes_on_votable_id" - create_table "wildlifeships", force: :cascade do |t| t.integer "user_id" t.integer "creature_id" diff --git a/spec/controllers/subscriptions_controller_spec.rb b/spec/controllers/subscriptions_controller_spec.rb index 10b53f91..de9a7476 100644 --- a/spec/controllers/subscriptions_controller_spec.rb +++ b/spec/controllers/subscriptions_controller_spec.rb @@ -93,7 +93,7 @@ RSpec.describe SubscriptionsController, type: :controller do describe "User with no plan (fallback to Starter) tries to upgrade" do it "redirects to payment method form if they don't have a payment method saved" do expect(@user.active_subscriptions).to eq([]) - post :change, {stripe_plan_id: 'premium'} + post :change, params: { stripe_plan_id: 'premium' } expect(subject).to redirect_to action: :information, plan: 'premium' end end @@ -106,7 +106,7 @@ RSpec.describe SubscriptionsController, type: :controller do end it "redirects to payment method form if they don't have a payment method saved" do - post :change, {stripe_plan_id: 'premium'} + post :change, params: { stripe_plan_id: 'premium' } expect(subject).to redirect_to action: :information, plan: 'premium' end @@ -132,7 +132,7 @@ RSpec.describe SubscriptionsController, type: :controller do expect(@user.selected_billing_plan_id).to eq(@free_plan.id) expect(@user.active_billing_plans).to eq([@free_plan]) - post :change, {stripe_plan_id: 'premium'} + post :change, params: { stripe_plan_id: 'premium' } @user.reload expect(@user.selected_billing_plan_id).to eq(@premium_plan.id) @@ -176,7 +176,7 @@ RSpec.describe SubscriptionsController, type: :controller do it "allows downgrading to Starter" do # Downgrade to Starter - post :change, { stripe_plan_id: 'starter' } + post :change, params: { stripe_plan_id: 'starter' } @user.reload expect(@user.selected_billing_plan_id).to eq(@free_plan.id) @@ -215,27 +215,27 @@ RSpec.describe SubscriptionsController, type: :controller do it 'grants storage space to a user after upgrading' do @user.update(upload_bandwidth_kb: 100) - post :change, { stripe_plan_id: 'premium' } + post :change, params: { stripe_plan_id: 'premium' } expect(@user.upload_bandwidth_kb).to eq(100 + @premium_plan.bonus_bandwidth_kb) end it 'decreases storage space for a user after downgrading' do @user.update(upload_bandwidth_kb: 100) - post :change, { stripe_plan_id: 'starter' } + post :change, params: { stripe_plan_id: 'starter' } expect(@user.upload_bandwidth_kb).to eq(100 - @premium_plan.bonus_bandwidth_kb) end it 'does not adjust storage space when going premium --> premium' do @user.update(upload_bandwidth_kb: 101) @user.update(selected_billing_plan_id: @premium_plan.id) - post :change, { stripe_plan_id: @premium_annual_plan.stripe_plan_id } + post :change, params: { stripe_plan_id: @premium_annual_plan.stripe_plan_id } expect(@user.upload_bandwidth_kb).to eq(101) end it 'does not adjust storage space if no plan change is made' do @user.update(upload_bandwidth_kb: 101) @user.update(selected_billing_plan_id: @premium_annual_plan.stripe_plan_id) - post :change, { stripe_plan_id: @premium_plan.stripe_plan_id } + post :change, params: { stripe_plan_id: @premium_plan.stripe_plan_id } expect(@user.upload_bandwidth_kb).to eq(101) end end diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 7d0080fa..a9f7b6bc 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -6,7 +6,7 @@ RSpec.describe UsersController, type: :controller do describe 'GET #show/:id' do it 'responds successfully with an HTTP 200 status code' do - get :show, id: user.id + get :show, params: { id: user.id } expect(response).to be_success expect(response).to have_http_status(200) end diff --git a/spec/controllers/write_controller_spec.rb b/spec/controllers/write_controller_spec.rb index 96e5a479..82fc05a8 100644 --- a/spec/controllers/write_controller_spec.rb +++ b/spec/controllers/write_controller_spec.rb @@ -9,7 +9,7 @@ RSpec.describe WriteController, type: :controller do sign_in @user - get :editor, scene_id: 1 + get :editor, params: { scene_id: 1 } end it { is_expected.to respond_with(200) } diff --git a/spec/support/content_controller_example.rb b/spec/support/content_controller_example.rb index abdebeb5..6ed8b117 100644 --- a/spec/support/content_controller_example.rb +++ b/spec/support/content_controller_example.rb @@ -36,32 +36,32 @@ shared_examples_for 'a controller for a content item' do describe 'POST #create' do before do - post :create, @model_name => { + post :create, params: { @model_name => { name: model.name, user: @user - } + } } end it { is_expected.to redirect_to(polymorphic_path(assigns(:content))) } end describe 'GET #edit' do - before { get :edit, id: model.id } + before { get :edit, params: { id: model.id } } it { is_expected.to respond_with(200) } it { is_expected.to render_template(locals: "#{@model_name.pluralize}/edit", layout: :application) } end describe 'PUT #update' do before do - put :update, id: model.id, @model_name => { + put :update, params: { id: model.id, @model_name => { name: model.name, user: @user - } + } } end it { is_expected.to redirect_to(polymorphic_path(model)) } end describe 'DELETE #destroy' do - before { delete :destroy, id: model.id } + before { delete :destroy, params: { id: model.id } } it { is_expected.to redirect_to(polymorphic_path(@model_class)) } describe 'the destroyed model' do From fc9bedf32efba3052f462a7ecbeffc4cb825c2f9 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sun, 22 Jul 2018 00:22:10 -0500 Subject: [PATCH 12/26] restart --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index 20b31fce..c3b2623d 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,4 +1,4 @@ -= Notebook.ai += Notebook.ai {Build Status}[https://travis-ci.org/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook/coverage] From 8dd5338774d034885c1450f76519c5503e212c92 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sun, 22 Jul 2018 00:27:56 -0500 Subject: [PATCH 13/26] restart heroku --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index c3b2623d..52b06c95 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,4 +1,4 @@ -= Notebook.ai += Notebook.ai {Build Status}[https://travis-ci.org/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook/coverage] From e242e941fc43993851ede4d9fc279fdef01b4732 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sun, 22 Jul 2018 23:03:25 -0500 Subject: [PATCH 14/26] restart --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index 52b06c95..c3b2623d 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,4 +1,4 @@ -= Notebook.ai += Notebook.ai {Build Status}[https://travis-ci.org/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook/coverage] From a13efa29c41039c2c3090439e3cb0f10fda3d33f Mon Sep 17 00:00:00 2001 From: Tristan Date: Tue, 24 Jul 2018 17:12:17 -0500 Subject: [PATCH 15/26] update .tool-versions --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index dcacdebe..0d371532 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 2.3.0 +ruby 2.5.1 From eb6b77fe09c708839541723aea359294036f14e0 Mon Sep 17 00:00:00 2001 From: Tristan Date: Wed, 25 Jul 2018 16:07:14 -0500 Subject: [PATCH 16/26] newer bundler --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 052a2579..4b1bf6c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -559,4 +559,4 @@ RUBY VERSION ruby 2.5.1p57 BUNDLED WITH - 1.16.2 + 1.16.3 From 1ec410351f592b161a2bfa3f8846d10723980b17 Mon Sep 17 00:00:00 2001 From: Tristan Date: Wed, 25 Jul 2018 18:41:56 -0500 Subject: [PATCH 17/26] TEMPORARY COMMIT FOR STAGING --- config/database.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.yml b/config/database.yml index df2ab01c..1e412377 100644 --- a/config/database.yml +++ b/config/database.yml @@ -24,6 +24,6 @@ cucumber: <<: *test production: - url: <%= ENV['DATABASE_URL'] %> + url: <%= ENV['PRODUCTION_DATABASE_URL'] %> pool: <%= ENV['RAILS_MAX_THREADS'] || 5 %> prepared_statements: false From 7600564bd5b02774266b1453dcf58ff536e7c12d Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sat, 28 Jul 2018 16:41:05 -0500 Subject: [PATCH 18/26] restart --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index c3b2623d..20b31fce 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,4 +1,4 @@ -= Notebook.ai += Notebook.ai {Build Status}[https://travis-ci.org/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook/coverage] From c619f6f66237f264f5f1004e57f87774ce175a6a Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 3 Aug 2018 13:49:32 -0500 Subject: [PATCH 19/26] restart --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index 20b31fce..c3b2623d 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,4 +1,4 @@ -= Notebook.ai += Notebook.ai {Build Status}[https://travis-ci.org/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook/coverage] From b2f1415e34e34552e388bd71828616316dd0860c Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Tue, 7 Aug 2018 18:17:48 -0500 Subject: [PATCH 20/26] restart --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index c3b2623d..20b31fce 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,4 +1,4 @@ -= Notebook.ai += Notebook.ai {Build Status}[https://travis-ci.org/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook/coverage] From a816362bcdf8537cb06f926c5c1fefab7918018f Mon Sep 17 00:00:00 2001 From: Tristan Date: Wed, 8 Aug 2018 11:42:17 -0500 Subject: [PATCH 21/26] fix paperclip polymorphism issue --- app/views/content/display/_image_card_header.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/content/display/_image_card_header.html.erb b/app/views/content/display/_image_card_header.html.erb index bffc8dc9..ad5784bc 100644 --- a/app/views/content/display/_image_card_header.html.erb +++ b/app/views/content/display/_image_card_header.html.erb @@ -4,7 +4,7 @@ <% if @content.image_uploads.any? %> <% @content.image_uploads.each do |image| %>
  • - <%= image_tag image.src %> + <%= image_tag image.src.url(:thumb) %>

    <%= @content.name %>

    <%= @content.description %>
    @@ -21,4 +21,4 @@
    • <% end %>
- \ No newline at end of file + From 40d481ed5de7f30faf2735a9be7eae6c5fe17084 Mon Sep 17 00:00:00 2001 From: Tristan Date: Wed, 8 Aug 2018 11:46:39 -0500 Subject: [PATCH 22/26] adjust image sizes --- app/views/content/display/_image_card_header.html.erb | 2 +- app/views/content/form/images/_gallery.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/content/display/_image_card_header.html.erb b/app/views/content/display/_image_card_header.html.erb index ad5784bc..1c0e7b3e 100644 --- a/app/views/content/display/_image_card_header.html.erb +++ b/app/views/content/display/_image_card_header.html.erb @@ -4,7 +4,7 @@ <% if @content.image_uploads.any? %> <% @content.image_uploads.each do |image| %>
  • - <%= image_tag image.src.url(:thumb) %> + <%= image_tag image.src.url(:large) %>

    <%= @content.name %>

    <%= @content.description %>
    diff --git a/app/views/content/form/images/_gallery.html.erb b/app/views/content/form/images/_gallery.html.erb index a30d3a52..b4c73a0b 100644 --- a/app/views/content/form/images/_gallery.html.erb +++ b/app/views/content/form/images/_gallery.html.erb @@ -4,7 +4,7 @@
    <% images = content.image_uploads %> <% images.each do |image| %> - <%= link_to image.src(:original), class: 'z-depth-1 hoverable', target: '_new' do %> + <%= link_to image.src(:thumb), class: 'z-depth-1 hoverable', target: '_new' do %> <%= image_tag image.src(images.count == 1 ? :hero : :medium) %> <% end %> <% end %> From 1a24d00bd1abae0654aac4b1587413e810768ede Mon Sep 17 00:00:00 2001 From: Tristan Date: Wed, 8 Aug 2018 11:50:56 -0500 Subject: [PATCH 23/26] oops, undo that last bit --- app/views/content/form/images/_gallery.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/content/form/images/_gallery.html.erb b/app/views/content/form/images/_gallery.html.erb index b4c73a0b..a30d3a52 100644 --- a/app/views/content/form/images/_gallery.html.erb +++ b/app/views/content/form/images/_gallery.html.erb @@ -4,7 +4,7 @@
    <% images = content.image_uploads %> <% images.each do |image| %> - <%= link_to image.src(:thumb), class: 'z-depth-1 hoverable', target: '_new' do %> + <%= link_to image.src(:original), class: 'z-depth-1 hoverable', target: '_new' do %> <%= image_tag image.src(images.count == 1 ? :hero : :medium) %> <% end %> <% end %> From 8c570303bf67f07d6f3eba0133150d320b41c775 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 13 Aug 2018 22:59:52 -0500 Subject: [PATCH 24/26] restart --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index 20b31fce..c3b2623d 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,4 +1,4 @@ -= Notebook.ai += Notebook.ai {Build Status}[https://travis-ci.org/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook] {}[https://codeclimate.com/github/indentlabs/notebook/coverage] From f67937c93748db4795dcbd5e418c2374b6d56cd5 Mon Sep 17 00:00:00 2001 From: Tristan Date: Tue, 14 Aug 2018 18:32:48 -0500 Subject: [PATCH 25/26] only show recently edited pages dropdown if page count > 0 --- app/views/layouts/_navbar.html.erb | 20 +++++++++++--------- app/views/layouts/_sidenav.html.erb | 4 +++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb index 92d5bcb6..17b10cf5 100644 --- a/app/views/layouts/_navbar.html.erb +++ b/app/views/layouts/_navbar.html.erb @@ -152,16 +152,18 @@