Skip to content

Commit

Permalink
Merge resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
drusepth committed Mar 14, 2015
1 parent 8dca1c7 commit 06c6b0c
Show file tree
Hide file tree
Showing 73 changed files with 685 additions and 752 deletions.
57 changes: 10 additions & 47 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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'
201 changes: 82 additions & 119 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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)
3 changes: 1 addition & 2 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
71 changes: 1 addition & 70 deletions app/models/character.rb
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
Loading

0 comments on commit 06c6b0c

Please sign in to comment.