diff --git a/Gemfile b/Gemfile index afa2f7017..7c7e8090e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,53 +1,16 @@ source 'https://rubygems.org' -ruby '2.0.0' -gem 'rails', '3.2.13' - -# Mongo stuff -gem 'bson_ext', '1.6.0' -gem 'mongo', '1.6.0' -gem 'mongoid' - -# File uploads -gem 'mongoid-paperclip', :require => "mongoid_paperclip" -gem 'aws-sdk', '~> 1.3.4' +gem 'rails', '4.1.0' +gem 'sqlite3' +gem 'paperclip', '~> 4.2.0' gem 'rmagick' -# Gems used only for assets and not required -# in production environments by default. -group :assets do - gem 'sass-rails', '~> 3.2.3' - gem 'less-rails' - #gem 'less-rails-fontawesome' - gem 'coffee-rails', '~> 3.2.1' - - #gem 'bootplus-rails' - #gem 'twitter-bootstrap-rails' - - # See https://github.com/sstephenson/execjs#readme for more supported runtimes - gem 'therubyracer', '~> 0.12.1', :platform => :ruby - - gem 'uglifier', '>= 1.0.3' -end - -group :test do - gem 'factory_girl_rails' - gem 'database_cleaner' -end +gem 'sass-rails', '~> 4.0.3' +gem 'less-rails' +gem 'less-rails-fontawesome' +gem 'uglifier', '>= 1.3.0' +gem 'coffee-rails', '~> 4.0.0' +gem 'therubyracer', platforms: :ruby +gem 'bootplus-rails' gem 'jquery-rails' - -# To use ActiveModel has_secure_password -# gem 'bcrypt-ruby', '~> 3.0.0' - -# To use Jbuilder templates for JSON -# gem 'jbuilder' - -# Use unicorn as the app server -# gem 'unicorn' - -# Deploy with Capistrano -# gem 'capistrano' - -# To use debugger -# gem 'ruby-debug19', :require => 'ruby-debug' diff --git a/Gemfile.lock b/Gemfile.lock index cecf9b7fa..b229183f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,70 +1,52 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - builder (~> 3.0.0) + actionmailer (4.1.0) + actionpack (= 4.1.0) + actionview (= 4.1.0) + mail (~> 2.5.4) + actionpack (4.1.0) + actionview (= 4.1.0) + activesupport (= 4.1.0) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + actionview (4.1.0) + activesupport (= 4.1.0) + builder (~> 3.1) erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) - builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) - multi_json (~> 1.0) - arel (3.0.3) - aws-sdk (1.3.9) - httparty (~> 0.7) - json (~> 1.4) - nokogiri (>= 1.4.4) - uuidtools (~> 2.1) - bson (1.6.0) - bson_ext (1.6.0) - bson (= 1.6.0) - builder (3.0.4) + activemodel (4.1.0) + activesupport (= 4.1.0) + builder (~> 3.1) + activerecord (4.1.0) + activemodel (= 4.1.0) + activesupport (= 4.1.0) + arel (~> 5.0.0) + activesupport (4.1.0) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.1) + tzinfo (~> 1.1) + arel (5.0.1.20140414130214) + bootplus-rails (1.0.0) + builder (3.2.2) climate_control (0.0.3) activesupport (>= 3.0) - cocaine (0.5.3) + cocaine (0.5.4) climate_control (>= 0.0.3, < 1.0) - coffee-rails (3.2.2) + coffee-rails (4.0.1) coffee-script (>= 2.2.0) - railties (~> 3.2.0) - coffee-script (2.2.0) + railties (>= 4.0.0, < 5.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.7.1) commonjs (0.2.7) - database_cleaner (1.2.0) erubis (2.7.0) - execjs (2.0.2) - factory_girl (4.4.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.4.1) - factory_girl (~> 4.4.0) - railties (>= 3.0.0) + execjs (2.2.1) hike (1.2.3) - httparty (0.13.0) - json (~> 1.8) - multi_xml (>= 0.5.2) - i18n (0.6.1) - journey (1.0.4) - jquery-rails (3.1.0) + i18n (0.6.11) + jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) @@ -78,98 +60,79 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - mini_portile (0.5.2) - mongo (1.6.0) - bson (= 1.6.0) - mongoid (3.1.6) - activemodel (~> 3.2) - moped (~> 1.4) - origin (~> 1.0) - tzinfo (~> 0.3.29) - mongoid-paperclip (0.0.9) - paperclip (>= 2.3.6) - moped (1.5.2) - multi_json (1.9.0) - multi_xml (0.5.5) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) - nokogiri (1.6.1-x86-mingw32) - mini_portile (~> 0.5.0) - origin (1.1.0) - paperclip (4.1.1) + minitest (5.4.0) + multi_json (1.10.1) + paperclip (4.2.0) activemodel (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.3) mime-types - polyglot (0.3.4) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.3) - rack + polyglot (0.3.5) + rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) - bundler (~> 1.0) - railties (= 3.2.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) - rack-ssl (~> 1.3.2) + rails (4.1.0) + actionmailer (= 4.1.0) + actionpack (= 4.1.0) + actionview (= 4.1.0) + activemodel (= 4.1.0) + activerecord (= 4.1.0) + activesupport (= 4.1.0) + bundler (>= 1.3.0, < 2.0) + railties (= 4.1.0) + sprockets-rails (~> 2.0) + railties (4.1.0) + actionpack (= 4.1.0) + activesupport (= 4.1.0) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (10.1.1) - rdoc (3.12.2) - json (~> 1.4) + thor (>= 0.18.1, < 2.0) + rake (10.3.2) ref (1.0.5) rmagick (2.13.2) - sass (3.3.3) - sass-rails (3.2.6) - railties (~> 3.2.0) - sass (>= 3.1.10) - tilt (~> 1.3) - sprockets (2.2.2) + sass (3.2.19) + sass-rails (4.0.3) + railties (>= 4.0.0, < 5.0) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) + sprockets-rails (~> 2.0) + sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.1.3) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) + sqlite3 (1.3.9) therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref - thor (0.18.1) + thor (0.19.1) + thread_safe (0.3.4) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.39) - uglifier (2.5.0) + tzinfo (1.2.1) + thread_safe (~> 0.1) + uglifier (2.5.1) execjs (>= 0.3.0) json (>= 1.8.0) - uuidtools (2.1.4) PLATFORMS ruby - x86-mingw32 DEPENDENCIES - aws-sdk (~> 1.3.4) - bson_ext (= 1.6.0) - coffee-rails (~> 3.2.1) - database_cleaner - factory_girl_rails + bootplus-rails + coffee-rails (~> 4.0.0) jquery-rails less-rails - mongo (= 1.6.0) - mongoid - mongoid-paperclip - rails (= 3.2.13) + less-rails-fontawesome + paperclip (~> 4.2.0) + rails (= 4.1.0) rmagick - sass-rails (~> 3.2.3) - therubyracer (~> 0.12.1) - uglifier (>= 1.0.3) + sass-rails (~> 4.0.3) + sqlite3 + therubyracer + uglifier (>= 1.3.0) \ No newline at end of file diff --git a/Rakefile b/Rakefile index 659f1981a..ba6b733dd 100644 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,6 @@ -#!/usr/bin/env rake # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. require File.expand_path('../config/application', __FILE__) -PlanCharacters::Application.load_tasks +Rails.application.load_tasks diff --git a/app/models/.gitkeep b/app/assets/images/.keep similarity index 100% rename from app/models/.gitkeep rename to app/assets/images/.keep diff --git a/lib/assets/.gitkeep b/app/controllers/concerns/.keep similarity index 100% rename from lib/assets/.gitkeep rename to app/controllers/concerns/.keep diff --git a/log/.gitkeep b/app/mailers/.keep similarity index 100% rename from log/.gitkeep rename to app/mailers/.keep diff --git a/test/functional/.gitkeep b/app/models/.keep similarity index 100% rename from test/functional/.gitkeep rename to app/models/.keep diff --git a/app/models/character.rb b/app/models/character.rb index 69ed96aad..9d52c1881 100644 --- a/app/models/character.rb +++ b/app/models/character.rb @@ -1,71 +1,2 @@ -class Character - include Mongoid::Document - - # General - field :name, :type => String - field :role, :type => String - field :gender, :type => String - field :age, :type => String - - # Appearance - field :height, :type => String - field :weight, :type => String - field :haircolor, :type => String - field :hairstyle, :type => String - field :facialhair, :type => String - field :eyecolor, :type => String - field :race, :type => String - field :skintone, :type => String - field :bodytype, :type => String - field :identmarks, :type => String # Identifying marks - - # Social - field :bestfriend, :type => String - field :religion, :type => String - field :politics, :type => String - field :prejudices, :type => String - field :occupation, :type => String - field :pets, :type => String - #How might others describe him? - #What would others change about him? - - # Behavior - field :mannerisms, :type => String - #What drives this character? - #What is standing in his way? - #What is he most afraid of? - #What does he need most? - #What makes him vulnerable? - #What kind of trouble does he get in? - - # History - field :birthday, :type => String - field :birthplace, :type => String - field :education, :type => String - field :background, :type => String - #What is his deepest secret? - #Does he have a history of criminal activity? - - # Favorites - field :fave_color, :type => String - field :fave_food, :type => String - field :fave_possession, :type => String - field :fave_weapon, :type => String - field :fave_animal, :type => String - #favorite leisure activities - - # Relationships - field :father, :type => String - field :mother, :type => String - field :spouse, :type => String - field :siblings, :type => String - field :archenemy, :type => String - - # Notes - field :notes, :type => String - field :private_notes, :type => String - #additional fields - - belongs_to :user - belongs_to :universe +class Character < ActiveRecord::Base end diff --git a/test/integration/.gitkeep b/app/models/concerns/.keep similarity index 100% rename from test/integration/.gitkeep rename to app/models/concerns/.keep diff --git a/app/models/equipment.rb b/app/models/equipment.rb index f503869c1..0cd8d98b9 100644 --- a/app/models/equipment.rb +++ b/app/models/equipment.rb @@ -1,28 +1,2 @@ -class Equipment - include Mongoid::Document - - # General - field :name, :type => String - field :equip_type, :type => String - - # Appearance - field :description, :type => String - field :weight, :type => String - - # History - field :original_owner, :type => String - field :current_owner, :type => String - field :made_by, :type => String - field :materials, :type => String - field :year_made, :type => String - - # Abilities - field :magic, :type => String # Magical Properties - - # Notes - field :notes, :type => String - field :private_notes, :type => String - - belongs_to :user - belongs_to :universe +class Equipment < ActiveRecord::Base end diff --git a/app/models/language.rb b/app/models/language.rb index 447df5061..addcdda68 100644 --- a/app/models/language.rb +++ b/app/models/language.rb @@ -1,23 +1,2 @@ -class Language - include Mongoid::Document - - # General - field :name, :type => String - - # Vocabulary - field :words, :type => String - - # History - field :established_year, :type => String - field :established_location, :type => String - - # Speakers - field :characters, :type => String - field :locations, :type => String - - # More - field :notes, :type => String - - belongs_to :user - belongs_to :universe +class Language < ActiveRecord::Base end diff --git a/app/models/location.rb b/app/models/location.rb index 34ab75da9..e3acd9004 100644 --- a/app/models/location.rb +++ b/app/models/location.rb @@ -1,50 +1,2 @@ -class Location - include Mongoid::Document - include Mongoid::Paperclip - - # General - field :name, :type => String - field :type_of, :type => String - field :description, :type => String - - # Map - has_mongoid_attached_file :map, - styles: { -# original: '1920x1680>', -# thumb: '200x200>', -# todo -# make banner for cards -# resize full-size for large-cards -# make thumbnail for small-cards - }, - default_url: '/assets/placeholders/map.png' - - # Culture - field :population, :type => String - field :language, :type => String - field :currency, :type => String - field :motto, :type => String - #field :flag, :type => Image - #field :seal, :type => Image - - # Cities - field :capital, :type => String - field :largest_city, :type => String - field :notable_cities, :type => String - - # Geography - field :area, :type => String - field :crops, :type => String - field :located_at, :type => String - - # History - field :established_year, :type => String - field :notable_wars, :type => String - - # Notes - field :notes, :type => String - field :private_notes, :type => String - - belongs_to :user - belongs_to :universe +class Location < ActiveRecord::Base end diff --git a/app/models/magic.rb b/app/models/magic.rb index e7ae7a568..2ab3d408c 100644 --- a/app/models/magic.rb +++ b/app/models/magic.rb @@ -1,32 +1,2 @@ -class Magic - include Mongoid::Document - - # General - field :name, :type => String - field :type_of, :type => String # "Type of": Spell, Ability, Enchantment, etc - - # Appearance - field :manifestation, :type => String - field :symptoms, :type => String - - # Alignment - field :element, :type => String - field :diety, :type => String - - # Effects - field :harmfulness, :type => String # Harmful effects - field :helpfulness, :type => String # Helpful effects - field :neutralness, :type => String # Neutral effects - - # Requirements - field :resource, :type => String # Resource required - field :skill_level, :type => String # Skill required - field :limitations, :type => String - - # Notes - field :notes, :type => String - field :private_notes, :type => String - - belongs_to :user - belongs_to :universe +class Magic < ActiveRecord::Base end diff --git a/app/models/session.rb b/app/models/session.rb index 2cf4aaf25..54fee45a2 100644 --- a/app/models/session.rb +++ b/app/models/session.rb @@ -1,7 +1,2 @@ -class Session - include Mongoid::Document - field :username, :type => String - field :password, :type => String - - validates_presence_of :username, :password +class Session < ActiveRecord::Base end diff --git a/app/models/universe.rb b/app/models/universe.rb index 7c914e20b..47c1fe6a2 100644 --- a/app/models/universe.rb +++ b/app/models/universe.rb @@ -1,55 +1,2 @@ -class Universe - include Mongoid::Document - - # General - field :name, :type => String - field :description, :type => String - - # History - field :history, :type => String - - # More... - field :notes, :type => String - field :private_notes, :type => String - - # Settings - field :privacy, :type => String # Whether or not this universe is public, options are 'private' or 'public' - - belongs_to :user - - def content_count - [ - characters.length, - equipment.length, - languages.length, - locations.length, - magics.length, - ].sum - end - - def characters - Character.where(universe_id: id) - end - - def equipment - Equipment.where(universe_id: id) - end - - def languages - Language.where(universe_id: id) - end - - def locations - Location.where(universe_id: id) - end - - def magics - Magic.where(universe_id: id) - end - - - def to_s - self.name - end - +class Universe < ActiveRecord::Base end diff --git a/app/models/user.rb b/app/models/user.rb index 57842360b..4a57cf079 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,62 +1,2 @@ -class User - include Mongoid::Document - field :name, :type => String - field :email, :type => String - field :password, :type => String - - validates_presence_of :name, :email, :password - validates_uniqueness_of :name, :email - - before_save :hash_password - def hash_password - require 'digest' - self.password = Digest::MD5.hexdigest(self.name + "'s password IS... " + self.password + " (lol!)") - end - - def content - { - :characters => characters, - :equipment => equipment, - :languages => languages, - :locations => locations, - :magics => magics, - :universes => universes - } - end - - def content_count - [ - characters.length, - equipment.length, - languages.length, - locations.length, - magics.length, - universes.length - ].sum - end - - def characters - Character.where(user_id: id) - end - - def equipment - Equipment.where(user_id: id) - end - - def languages - Language.where(user_id: id) - end - - def locations - Location.where(user_id: id) - end - - def magics - Magic.where(user_id: id) - end - - def universes - Universe.where(user_id: id) - end - +class User < ActiveRecord::Base end diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..7feb6a30e --- /dev/null +++ b/bin/rails @@ -0,0 +1,8 @@ +#!/usr/bin/env ruby +begin + load File.expand_path("../spring", __FILE__) +rescue LoadError +end +APP_PATH = File.expand_path('../../config/application', __FILE__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..8017a0271 --- /dev/null +++ b/bin/rake @@ -0,0 +1,8 @@ +#!/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/spring b/bin/spring new file mode 100755 index 000000000..253ec37c3 --- /dev/null +++ b/bin/spring @@ -0,0 +1,18 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast +# It gets overwritten when you run the `spring binstub` command + +unless defined?(Spring) + require "rubygems" + require "bundler" + + if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ spring \((.*?)\)$.*?^$/m) + ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR) + ENV["GEM_HOME"] = "" + Gem.paths = ENV + + gem "spring", match[1] + require "spring/binstub" + end +end diff --git a/config/application.rb b/config/application.rb index 981ae9160..424461131 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,38 +1,17 @@ require File.expand_path('../boot', __FILE__) -# Pick the frameworks you want: -# require "active_record/railtie" -require "action_controller/railtie" -require "action_mailer/railtie" -require "active_resource/railtie" -require "sprockets/railtie" -require "rails/test_unit/railtie" +require 'rails/all' -if defined?(Bundler) - # If you precompile assets before deploying to production, use this line - Bundler.require(*Rails.groups(:assets => %w(development test))) - # If you want your assets lazily compiled in production, use this line - # Bundler.require(:default, :assets, Rails.env) -end +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) module PlanCharacters class Application < Rails::Application - Mongoid.load!("config/mongoid.yml") - # 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. - # Custom directories with classes and modules you want to be autoloadable. - # config.autoload_paths += %W(#{config.root}/extras) - - # Only load the plugins named here, in the order given (default is alphabetical). - # :all can be used as a placeholder for all plugins not explicitly named. - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Activate observers that should always be running. - # config.active_record.observers = :cacher, :garbage_collector, :forum_observer - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. # config.time_zone = 'Central Time (US & Canada)' @@ -40,28 +19,5 @@ class Application < Rails::Application # 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 - - # Configure the default encoding used in templates for Ruby 1.9. - config.encoding = "utf-8" - - # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters += [:password] - - # Use SQL instead of Active Record's schema dumper when creating the database. - # This is necessary if your schema can't be completely dumped by the schema dumper, - # like if you have constraints or database-specific column types - # config.active_record.schema_format = :sql - - # Enforce whitelist mode for mass assignment. - # This will create an empty whitelist of attributes available for mass-assignment for all models - # in your app. As such, your models will need to explicitly whitelist or blacklist accessible - # parameters by using an attr_accessible or attr_protected declaration. - # config.active_record.whitelist_attributes = true - - # Enable the asset pipeline - config.assets.enabled = true - - # Version of your assets, change this if you want to expire all your assets - config.assets.version = '1.0' end end diff --git a/config/boot.rb b/config/boot.rb index 4489e5868..5e5f0c1fa 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,6 +1,4 @@ -require 'rubygems' - # Set up gems listed in the Gemfile. ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) -require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) +require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..1c1a37ca8 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +# +default: &default + adapter: sqlite3 + pool: 5 + timeout: 5000 + +development: + <<: *default + database: db/development.sqlite3 + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: db/test.sqlite3 + +production: + <<: *default + database: db/production.sqlite3 diff --git a/config/environment.rb b/config/environment.rb index 1edd35dae..ee8d90dc6 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,5 +1,5 @@ -# Load the rails application +# Load the Rails application. require File.expand_path('../application', __FILE__) -# Initialize the rails application -PlanCharacters::Application.initialize! +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/production.rb b/config/environments/production.rb index 148735360..d2e49ed66 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,5 +1,5 @@ -PlanCharacters::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. # Code is not reloaded between requests config.cache_classes = true @@ -11,8 +11,9 @@ # Disable Rails's static asset server (Apache or nginx will already do this) config.serve_static_assets = false - # Compress JavaScripts and CSS - config.assets.compress = true + # 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 @@ -20,8 +21,8 @@ # Generate digests for assets URLs config.assets.digest = true - # Defaults to Rails.root.join("public/assets") - # config.assets.manifest = YOUR_PATH + # Version of your assets, change this if you want to expire all your assets. + config.assets.version = '1.0' # Specifies the header that your server uses for sending files # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache @@ -30,8 +31,8 @@ # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # config.force_ssl = true - # See everything in the log (default is :info) - # config.log_level = :debug + # Set to :debug to see everything in the log. + config.log_level = :info # Prepend all log lines with the following tags # config.log_tags = [ :subdomain, :uuid ] @@ -74,3 +75,6 @@ end + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb index 4d7c9d338..10109e20b 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,5 +1,5 @@ -PlanCharacters::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. # The test environment is used exclusively to run your application's # test suite. You never need to work with it otherwise. Remember that diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..7a06a89f0 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.config.action_dispatch.cookies_serializer = :json \ No newline at end of file diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/mongoid.yml b/config/mongoid.yml deleted file mode 100644 index e9c31c2e3..000000000 --- a/config/mongoid.yml +++ /dev/null @@ -1,18 +0,0 @@ -development: - sessions: - default: - database: plan_characters_dev - hosts: - - localhost:27017 - -test: - sessions: - default: - database: myapp_test - hosts: - - localhost:27017 - -production: - sessions: - default: - uri: <%= ENV['MONGOHQ_URL'] %> diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..c2f2dfba7 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rake secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: d522bcefa477c6fbfe9b6c69f25a41f242e26cfd281dcfbb6c867e41e3b56c1c9ac6007737742b70b55a66207b2284f129734345707507c7b0d34fb45218005c + +test: + secret_key_base: ecaa93d4fba650ef30ef4925df71b8e9e8bdb47f0424166a2689950e268a1d27227a27f72f8f790f4272c2ef5ad06e86d05dad20eecd8df6c47ab12bed37c27a + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/db/migrate/20140713043535_create_models.rb b/db/migrate/20140713043535_create_models.rb new file mode 100644 index 000000000..e6bf25268 --- /dev/null +++ b/db/migrate/20140713043535_create_models.rb @@ -0,0 +1,236 @@ +class CreateModels < ActiveRecord::Migration + def change + create_table :characters do |t| + t.string :name, :null => false + t.string :role + t.string :gender + t.string :age + + # Appearance + 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 # Identifying marks + + # Social + t.text :bestfriend + t.text :religion + t.text :politics + t.text :prejudices + t.text :occupation + t.text :pets + #How might others describe him? + #What would others change about him? + + # Behavior + t.text :mannerisms + #What drives this character? + #What is standing in his way? + #What is he most afraid of? + #What does he need most? + #What makes him vulnerable? + #What kind of trouble does he get in? + + # History + t.text :birthday + t.text :birthplace + t.text :education + t.text :background + #What is his deepest secret? + #Does he have a history of criminal activity? + + # Favorites + t.string :fave_color + t.string :fave_food + t.string :fave_possession + t.string :fave_weapon + t.string :fave_animal + #favorite leisure activities + + # Relationships + t.text :father + t.text :mother + t.text :spouse + t.text :siblings + t.text :archenemy + + # Notes + t.text :notes + t.text :private_notes + + t.belongs_to :user + t.belongs_to :universe + + t.timestamps + end + + create_table :equipment do |t| + # General + t.string :name, :null => false + t.string :equip_type + + # Appearance + t.text :description + t.string :weight + + # History + t.string :original_owner + t.string :current_owner + t.text :made_by + t.text :materials + t.string :year_made + + # Abilities + t.text :magic # Magical Properties + + # Notes + t.text :notes + t.text :private_notes + + t.belongs_to :user + t.belongs_to :universe + + t.timestamps + end + + create_table :languages do |t| + # General + t.string :name, :null => false + + # Vocabulary + t.text :words + + # History + t.string :established_year + t.string :established_location + + # Speakers + t.text :characters + t.text :locations + + # More + t.text :notes + + t.belongs_to :user + t.belongs_to :universe + + t.timestamps + end + + create_table :locations do |t| + # General + t.string :name, :null => false + t.string :type_of + t.text :description + + # Map + t.attachment :map + + # Culture + t.string :population + t.string :language + t.string :currency + t.string :motto + #field :flag, :type => Image + #field :seal, :type => Image + + # Cities + t.text :capital + t.text :largest_city + t.text :notable_cities + + # Geography + t.text :area + t.text :crops + t.text :located_at + + # History + t.string :established_year + t.text :notable_wars + + # Notes + t.text :notes + t.text :private_notes + + t.belongs_to :user + t.belongs_to :universe + + t.timestamps + end + + create_table :magics do |t| + # General + t.string :name, :null => false + t.string :type_of # "Type of": Spell, Ability, Enchantment, etc + + # Appearance + t.text :manifestation + t.text :symptoms + + # Alignment + t.string :element + t.string :diety + + # Effects + t.text :harmfulness # Harmful effects + t.text :helpfulness # Helpful effects + t.text :neutralness # Neutral effects + + # Requirements + t.text :resource # Resource required + t.text :skill_level # Skill required + t.text :limitations + + # Notes + t.text :notes + t.text :private_notes + + t.belongs_to :user + t.belongs_to :universe + + t.timestamps + end + + create_table :sessions do |t| + + t.string :username, :unique => true, :null => false + t.string :password, :null => false + + t.timestamps + end + + create_table :universes do |t| + # General + t.string :name, :null => false + t.text :description + + # History + t.text :history + + # More... + t.text :notes + t.text :private_notes + + # Settings + t.string :privacy # 'private' or 'public' + + t.belongs_to :user + + t.timestamps + end + + create_table :users do |t| + t.string :name, :unique => true, :null => false + t.string :email, :unique => true, :null => false + t.string :password, :null => false + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..76293d637 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,169 @@ +# 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. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20140713043535) do + + create_table "characters", force: true 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 "bestfriend" + 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 "father" + t.text "mother" + t.text "spouse" + t.text "siblings" + t.text "archenemy" + t.text "notes" + t.text "private_notes" + t.integer "user_id" + t.integer "universe_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "equipment", force: true do |t| + t.string "name", null: false + t.string "equip_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" + end + + create_table "languages", force: true do |t| + t.string "name", null: false + t.text "words" + t.string "established_year" + t.string "established_location" + t.text "characters" + t.text "locations" + t.text "notes" + t.integer "user_id" + t.integer "universe_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "locations", force: true 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.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.datetime "created_at" + t.datetime "updated_at" + end + + create_table "magics", force: true do |t| + t.string "name", null: false + t.string "type_of" + t.text "manifestation" + t.text "symptoms" + t.string "element" + t.string "diety" + t.text "harmfulness" + t.text "helpfulness" + t.text "neutralness" + t.text "resource" + t.text "skill_level" + t.text "limitations" + t.text "notes" + t.text "private_notes" + t.integer "user_id" + t.integer "universe_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "sessions", force: true do |t| + t.string "username", null: false + t.string "password", null: false + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "universes", force: true 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.datetime "created_at" + t.datetime "updated_at" + end + + create_table "users", force: true do |t| + t.string "name", null: false + t.string "email", null: false + t.string "password", null: false + t.datetime "created_at" + t.datetime "updated_at" + end + +end diff --git a/test/unit/.gitkeep b/lib/assets/.keep similarity index 100% rename from test/unit/.gitkeep rename to lib/assets/.keep diff --git a/vendor/assets/javascripts/.gitkeep b/lib/tasks/.keep similarity index 100% rename from vendor/assets/javascripts/.gitkeep rename to lib/tasks/.keep diff --git a/lib/tasks/mongo.rake b/lib/tasks/mongo.rake deleted file mode 100644 index a9e8b52e0..000000000 --- a/lib/tasks/mongo.rake +++ /dev/null @@ -1,7 +0,0 @@ -namespace :db do - namespace :test do - task :prepare do - # Stub out for MongoDB - end - end -end diff --git a/vendor/assets/stylesheets/.gitkeep b/log/.keep similarity index 100% rename from vendor/assets/stylesheets/.gitkeep rename to log/.keep diff --git a/script/rails b/script/rails deleted file mode 100755 index f8da2cffd..000000000 --- a/script/rails +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env ruby -# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. - -APP_PATH = File.expand_path('../../config/application', __FILE__) -require File.expand_path('../../config/boot', __FILE__) -require 'rails/commands' diff --git a/vendor/plugins/.gitkeep b/test/controllers/.keep similarity index 100% rename from vendor/plugins/.gitkeep rename to test/controllers/.keep diff --git a/test/factories/factories.rb b/test/factories/factories.rb deleted file mode 100644 index bfab37e84..000000000 --- a/test/factories/factories.rb +++ /dev/null @@ -1,23 +0,0 @@ -FactoryGirl.define do - factory :user do - sequence(:name) {|n| "testuser#{n}" } - sequence(:email) {|n| "testemail#{n}" } - password "userpassword" - end - - factory :universe do - name "Test universe" - end - - factory :character do - name "MyString" - age "MyString" - end - - factory :session do - username "MyString" - password "MyString" - end - - -end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/characters.yml b/test/fixtures/characters.yml new file mode 100644 index 000000000..f227f68d7 --- /dev/null +++ b/test/fixtures/characters.yml @@ -0,0 +1,2 @@ +one: + name: Test diff --git a/test/fixtures/equipment.yml b/test/fixtures/equipment.yml new file mode 100644 index 000000000..f227f68d7 --- /dev/null +++ b/test/fixtures/equipment.yml @@ -0,0 +1,2 @@ +one: + name: Test diff --git a/test/fixtures/languages.yml b/test/fixtures/languages.yml new file mode 100644 index 000000000..f227f68d7 --- /dev/null +++ b/test/fixtures/languages.yml @@ -0,0 +1,2 @@ +one: + name: Test diff --git a/test/fixtures/locations.yml b/test/fixtures/locations.yml new file mode 100644 index 000000000..f227f68d7 --- /dev/null +++ b/test/fixtures/locations.yml @@ -0,0 +1,2 @@ +one: + name: Test diff --git a/test/fixtures/magics.yml b/test/fixtures/magics.yml new file mode 100644 index 000000000..f227f68d7 --- /dev/null +++ b/test/fixtures/magics.yml @@ -0,0 +1,2 @@ +one: + name: Test diff --git a/test/fixtures/sessions.yml b/test/fixtures/sessions.yml new file mode 100644 index 000000000..72e001719 --- /dev/null +++ b/test/fixtures/sessions.yml @@ -0,0 +1,3 @@ +one: + username: Test + password: Test \ No newline at end of file diff --git a/test/fixtures/universes.yml b/test/fixtures/universes.yml new file mode 100644 index 000000000..f227f68d7 --- /dev/null +++ b/test/fixtures/universes.yml @@ -0,0 +1,2 @@ +one: + name: Test diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 000000000..5f9df6009 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,4 @@ +one: + name: Test + email: Test + password: Test diff --git a/test/functional/characters_controller_test.rb b/test/functional/characters_controller_test.rb deleted file mode 100644 index fb8405ae6..000000000 --- a/test/functional/characters_controller_test.rb +++ /dev/null @@ -1,67 +0,0 @@ -require 'test_helper' - -class CharactersControllerTest < ActionController::TestCase - setup do - @user = create(:user) - @session = create(:session) - @universe = create(:universe) - @character = build(:character, user: @user) - end - - teardown do - DatabaseCleaner.clean - end - - test "should get index" do - get :index - assert_response :success - assert_not_nil assigns(:characters) - end - - test "should get new" do - get :new - assert_response :success - end - - test "should create character" do - assert_difference('Character.count') do - post :create, character: { age: @character.age, name: @character.name, universe: @universe} - end - - assert_redirected_to character_path(assigns(:character)) - end - - test "should show character" do - @character.save - get :show, id: @character - assert_response :success - end - - test "should get edit" do - @character.save - get :edit, id: @character - assert_response 302 - assert_redirected_to character_edit_path(@character) - end - - test "should update character" do - @character.save - put :update, id: @character, character: { age: @character.age, name: @character.name, universe: @universe } - - assert_response 302 - assert_redirected_to character_path(@character) - end - - test "should destroy character" do - @character.save - - assert_difference('Character.count', -1) do - delete :destroy, id: @character - end - - get :show, id: @character - assert_response 404 - - assert_redirected_to characters_path - end -end diff --git a/test/functional/generator_controller_test.rb b/test/functional/generator_controller_test.rb deleted file mode 100644 index 79831d68e..000000000 --- a/test/functional/generator_controller_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class GeneratorControllerTest < ActionController::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/functional/main_controller_test.rb b/test/functional/main_controller_test.rb deleted file mode 100644 index ce24b34cd..000000000 --- a/test/functional/main_controller_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'test_helper' - -class MainControllerTest < ActionController::TestCase - test "should get index" do - get :index - assert_response :success - end - -end diff --git a/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb deleted file mode 100644 index 6fe60f8a9..000000000 --- a/test/functional/sessions_controller_test.rb +++ /dev/null @@ -1,33 +0,0 @@ -require 'test_helper' - -class SessionsControllerTest < ActionController::TestCase - setup do - @session = build(:session) - end - - teardown do - DatabaseCleaner.clean - end - - test "should get new" do - get :new - assert_response :success - end - - test "should create session" do - assert_difference('Session.count') do - post :create, session: { password: @session.password, username: @session.username } - end - - assert_redirected_to session_path(assigns(:session)) - end - - test "should destroy session" do - @session.save - assert_difference('Session.count', -1) do - delete :destroy, id: @session - end - - assert_redirected_to sessions_path - end -end diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb deleted file mode 100644 index c67c56b5c..000000000 --- a/test/functional/users_controller_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class UsersControllerTest < ActionController::TestCase -end diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/unit/character_test.rb b/test/models/character_test.rb similarity index 58% rename from test/unit/character_test.rb rename to test/models/character_test.rb index bb4ff1736..6749ea6d1 100644 --- a/test/unit/character_test.rb +++ b/test/models/character_test.rb @@ -2,6 +2,6 @@ class CharacterTest < ActiveSupport::TestCase test "character exists" do - assert_not_nil build(:character), "Characters factory is returning nil" + assert_not_nil characters(:one) end end diff --git a/test/models/equipment_test.rb b/test/models/equipment_test.rb new file mode 100644 index 000000000..e4f5a89f1 --- /dev/null +++ b/test/models/equipment_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class EquipmentTest < ActiveSupport::TestCase + test "equipement exists" do + assert_not_nil equipment(:one) + end +end diff --git a/test/models/language_test.rb b/test/models/language_test.rb new file mode 100644 index 000000000..d9cd552c2 --- /dev/null +++ b/test/models/language_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class LanguageTest < ActiveSupport::TestCase + test "language exists" do + assert_not_nil languages(:one) + end +end diff --git a/test/models/location_test.rb b/test/models/location_test.rb new file mode 100644 index 000000000..16d8b64f6 --- /dev/null +++ b/test/models/location_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class LocationTest < ActiveSupport::TestCase + test "location exists" do + assert_not_nil locations(:one) + end +end diff --git a/test/models/magic_test.rb b/test/models/magic_test.rb new file mode 100644 index 000000000..33f334e6c --- /dev/null +++ b/test/models/magic_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class MagicTest < ActiveSupport::TestCase + test "magic exists" do + assert_not_nil magics(:one) + end +end diff --git a/test/unit/session_test.rb b/test/models/session_test.rb similarity index 59% rename from test/unit/session_test.rb rename to test/models/session_test.rb index 843028c8d..59595f138 100644 --- a/test/unit/session_test.rb +++ b/test/models/session_test.rb @@ -2,6 +2,6 @@ class SessionTest < ActiveSupport::TestCase test "session exists" do - assert_not_nil build(:session), "Sessions factory is returning nil" + assert_not_nil sessions(:one) end end diff --git a/test/models/universe_test.rb b/test/models/universe_test.rb new file mode 100644 index 000000000..7661765f4 --- /dev/null +++ b/test/models/universe_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class UniverseTest < ActiveSupport::TestCase + test "universe exists" do + assert_not_nil universes(:one) + end +end diff --git a/test/unit/user_test.rb b/test/models/user_test.rb similarity index 59% rename from test/unit/user_test.rb rename to test/models/user_test.rb index ff561469d..385ebdcb0 100644 --- a/test/unit/user_test.rb +++ b/test/models/user_test.rb @@ -2,6 +2,6 @@ class UserTest < ActiveSupport::TestCase test "user exists" do - assert_not_nil build(:user), "Users factory is returning nil" + assert_not_nil users(:one) end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 9265dbf97..bf95f8188 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,13 @@ -ENV["RAILS_ENV"] = "test" +ENV['RAILS_ENV'] ||= 'test' require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' class ActiveSupport::TestCase - include FactoryGirl::Syntax::Methods -end \ No newline at end of file + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + # + # Note: You'll currently still have to declare fixtures explicitly in integration tests + # -- they do not yet inherit this setting + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/test/unit/helpers/characters_helper_test.rb b/test/unit/helpers/characters_helper_test.rb deleted file mode 100644 index 9d0b2c383..000000000 --- a/test/unit/helpers/characters_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class CharactersHelperTest < ActionView::TestCase -end diff --git a/test/unit/helpers/generator_helper_test.rb b/test/unit/helpers/generator_helper_test.rb deleted file mode 100644 index 43e824616..000000000 --- a/test/unit/helpers/generator_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class GeneratorHelperTest < ActionView::TestCase -end diff --git a/test/unit/helpers/main_helper_test.rb b/test/unit/helpers/main_helper_test.rb deleted file mode 100644 index 22da3c404..000000000 --- a/test/unit/helpers/main_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class MainHelperTest < ActionView::TestCase -end diff --git a/test/unit/helpers/sessions_helper_test.rb b/test/unit/helpers/sessions_helper_test.rb deleted file mode 100644 index 7d44e0965..000000000 --- a/test/unit/helpers/sessions_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class SessionsHelperTest < ActionView::TestCase -end diff --git a/test/unit/helpers/users_helper_test.rb b/test/unit/helpers/users_helper_test.rb deleted file mode 100644 index 96af37a82..000000000 --- a/test/unit/helpers/users_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class UsersHelperTest < ActionView::TestCase -end diff --git a/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep new file mode 100644 index 000000000..e69de29bb