diff --git a/.gitignore b/.gitignore index f176882..812b182 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,5 @@ brakeman.html # Ignore sensitive data /config/settings/local.rb /nbproject/private/ +<<<<<<< HEAD +/config/database.yml diff --git a/Gemfile b/Gemfile index 4e5c171..5398ef4 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'nested_form' gem 'acts_as_list' gem 'geocoder' gem 'forgery' -gem 'paper_trail' +gem 'paper_trail', '~> 3.0.5' gem 'font-awesome-rails' gem 'wysiwyg-rails' gem 'rails-assets-cdn' diff --git a/Gemfile.lock b/Gemfile.lock index 8afcfcf..e376f08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,11 +12,6 @@ GIT i18n-active_record (0.0.2) i18n (>= 0.5.0) -PATH - remote: ../carmen/ - specs: - carmen (1.0.1) - GEM remote: http://rubygems.org/ specs: @@ -54,6 +49,7 @@ GEM arel (4.0.2) attr_required (1.0.0) awesome_print (1.2.0) + bcrypt (3.1.7) bcrypt (3.1.7-x86-mingw32) better_errors (1.1.0) coderay (>= 1.0.0) @@ -74,6 +70,8 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) + carmen (1.0.1) + unicode_utils (~> 1.4.0) carmen-rails (1.0.1) carmen (~> 1.0.0) rails @@ -139,6 +137,7 @@ GEM railties (>= 3.0.0) faraday (0.9.0) multipart-post (>= 1.2, < 3) + ffi (1.9.3) ffi (1.9.3-x86-mingw32) font-awesome-rails (4.1.0.0) railties (>= 3.2, < 5.0) @@ -149,6 +148,8 @@ GEM sass (>= 3.2.0) fssm (0.2.10) geocoder (1.2.3) + gherkin (2.12.2) + multi_json (~> 1.3) gherkin (2.12.2-x86-mingw32) multi_json (~> 1.3) guard (2.6.1) @@ -180,6 +181,7 @@ GEM json (1.8.1) jwt (0.1.13) multi_json (>= 1.5) + kgio (2.9.2) launchy (2.4.2) addressable (~> 2.3) listen (2.7.9) @@ -212,6 +214,8 @@ GEM net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) netrc (0.7.7) + nokogiri (1.6.2.1) + mini_portile (= 0.6.0) nokogiri (1.6.2.1-x86-mingw32) mini_portile (= 0.6.0) oauth (0.4.7) @@ -221,13 +225,14 @@ GEM jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) - paper_trail (3.0.3) + paper_trail (3.0.5) activerecord (>= 3.0, < 5.0) activesupport (>= 3.0, < 5.0) paypal-express (0.5.5) activesupport (>= 2.3) attr_required (>= 0.0.5) restclient_with_cert + pg (0.17.1) pg (0.17.1-x86-mingw32) poltergeist (1.5.1) capybara (~> 2.1) @@ -235,6 +240,10 @@ GEM multi_json (~> 1.0) websocket-driver (>= 0.2.0) polyglot (0.3.5) + pry (0.10.0) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) pry (0.10.0-x86-mingw32) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -265,10 +274,14 @@ GEM activesupport (= 4.0.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) + raindrops (0.13.0) rake (10.3.2) rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) + rest-client (1.7.2) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) rest-client (1.7.2-x86-mingw32) ffi (~> 1.9) mime-types (>= 1.16, < 3.0) @@ -346,6 +359,11 @@ GEM uglifier (2.5.3) execjs (>= 0.3.0) json (>= 1.8.0) + unicode_utils (1.4.0) + unicorn (4.8.3) + kgio (~> 2.6) + rack + raindrops (~> 0.7) wdm (0.1.0) webmock (1.18.0) addressable (>= 2.3.6) @@ -360,6 +378,7 @@ GEM nokogiri (~> 1.3) PLATFORMS + ruby x86-mingw32 DEPENDENCIES @@ -370,7 +389,6 @@ DEPENDENCIES binding_of_caller capistrano capybara - carmen! carmen-rails carrierwave carrierwave-imageoptimizer @@ -395,7 +413,7 @@ DEPENDENCIES mini_magick nested_form oauth2 (~> 0.8.0) - paper_trail + paper_trail (~> 3.0.5) paypal-express pg poltergeist @@ -412,6 +430,7 @@ DEPENDENCIES sitemap_generator sorcery (>= 0.8.1) uglifier (>= 1.3.0) + unicorn wdm (>= 0.1.0) webmock wysiwyg-rails diff --git a/config/application.rb b/config/application.rb index b8c5ba2..f185e8b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -26,7 +26,7 @@ module BikeBike # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] config.i18n.default_locale = :en #:de config.i18n.enforce_available_locales = false - self.paths['config/database'] = Rails.root.parent.join("secure/database.yml").to_s + self.paths['config/database'] = Rails.root.parent.join('BikeBike', 'config', 'database.yml') # config.action_controller.default_url_options = { :trailing_slash => true } #config.middleware.swap 'Rack::MethodOverride', 'Rack::MethodOverrideWithParams' #config.i18n.exception_handler = I18n::MissingTranslationExceptionHandler.new diff --git a/config/database.yml b/config/database.yml.example similarity index 94% rename from config/database.yml rename to config/database.yml.example index 7fee74a..8be0ccd 100644 --- a/config/database.yml +++ b/config/database.yml.example @@ -19,7 +19,7 @@ development: encoding: unicode database: bike_bike_dev username: bike_bike - password: NewOrleans@)!# + password: password host: 127.0.0.1 port: 5432 pool: 5 @@ -39,7 +39,7 @@ test: &test encoding: unicode database: bike_bike_test username: bike_bike - password: NewOrleans@)!# + password: password host: 127.0.0.1 port: 5432 pool: 5 @@ -49,10 +49,11 @@ production: encoding: unicode database: bike_bike username: bike_bike - password: NewOrleans@)!# + password: password host: 127.0.0.1 port: 5432 pool: 5 cucumber: <<: *test + diff --git a/db/schema.rb b/db/schema.rb index 3e479d8..fde0539 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,319 +1,319 @@ -# 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: 20140725001300) do - - # These are extensions that must be enabled in order to support this database - enable_extension "plpgsql" - - create_table "authentications", force: true do |t| - t.integer "user_id", null: false - t.string "provider", null: false - t.string "uid", null: false - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "conference_admins", force: true do |t| - t.integer "conference_id" - t.integer "user_id" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "conference_host_organizations", force: true do |t| - t.integer "conference_id" - t.integer "organization_id" - t.integer "order" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "conference_registration_form_fields", force: true do |t| - t.integer "conference_id" - t.integer "registration_form_field_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "position" - end - - create_table "conference_registration_responses", force: true do |t| - t.integer "conference_registration_id" - t.integer "registration_form_field_id" - t.text "data" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "conference_registrations", force: true do |t| - t.integer "conference_id" - t.integer "user_id" - t.string "is_attending" - t.datetime "created_at" - t.datetime "updated_at" - t.boolean "is_confirmed" - t.boolean "is_participant" - t.boolean "is_volunteer" - t.string "confirmation_token" - t.binary "data" - t.string "email" - t.boolean "complete" - t.boolean "completed" - t.string "payment_confirmation_token" - t.string "payment_info" - t.integer "registration_fees_paid" - end - - create_table "conference_types", force: true do |t| - t.string "title" - t.string "info" - t.datetime "created_at" - t.datetime "updated_at" - t.string "slug" - end - - create_table "conferences", force: true do |t| - t.string "title" - t.string "slug" - t.datetime "start_date" - t.datetime "end_date" - t.text "info" - t.string "poster" - t.string "cover" - t.boolean "workshop_schedule_published" - t.boolean "registration_open" - t.boolean "meals_provided" - t.text "meal_info" - t.text "travel_info" - t.integer "conference_type_id" - t.datetime "created_at" - t.datetime "updated_at" - t.text "preregistration_info" - t.text "registration_info" - t.text "postregistration_info" - t.integer "cover_attribution_id" - t.string "cover_attribution_name" - t.string "cover_attribution_src" - t.integer "cover_attribution_user_id" - end - - create_table "event_types", force: true do |t| - t.string "slug" - t.text "info" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "events", force: true do |t| - t.string "title" - t.string "slug" - t.integer "event_type_id" - t.integer "conference_id" - t.text "info" - t.integer "location_id" - t.datetime "start_time" - t.datetime "end_time" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "locations", force: true do |t| - t.string "title" - t.float "latitude" - t.float "longitude" - t.datetime "created_at" - t.datetime "updated_at" - t.string "country" - t.string "territory" - t.string "city" - t.string "street" - t.string "postal_code" - end - - add_index "locations", ["latitude", "longitude"], name: "index_locations_on_latitude_and_longitude", using: :btree - - create_table "locations_organizations", id: false, force: true do |t| - t.integer "organization_id" - t.integer "location_id" - end - - add_index "locations_organizations", ["organization_id", "location_id"], name: "loc_org_index", using: :btree - - create_table "organization_statuses", force: true do |t| - t.string "name" - t.string "slug" - t.string "info" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "organizations", force: true do |t| - t.string "name" - t.string "slug" - t.string "email_address" - t.string "url" - t.integer "year_founded" - t.text "info" - t.string "logo" - t.string "avatar" - t.boolean "requires_approval" - t.string "secret_question" - t.string "secret_answer" - t.integer "user_organization_replationship_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "cover" - t.integer "cover_attribution_id" - t.string "cover_attribution_name" - t.string "cover_attribution_src" - t.string "phone" - t.integer "organization_status_id" - t.integer "cover_attribution_user_id" - end - - create_table "registration_form_fields", force: true do |t| - t.string "title" - t.text "help" - t.boolean "required" - t.string "field_type" - t.string "options" - t.boolean "is_retired" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "sessions", force: true do |t| - t.string "session_id", null: false - t.text "data" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", unique: true, using: :btree - add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree - - create_table "translations", force: true do |t| - t.string "locale" - t.string "key" - t.text "value" - t.text "interpolations" - t.boolean "is_proc", default: false - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "user_organization_relationships", force: true do |t| - t.integer "user_id", null: false - t.integer "organization_id", null: false - t.string "relationship" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "users", force: true do |t| - t.string "username", null: false - t.string "email" - t.string "crypted_password" - t.string "salt" - t.datetime "created_at" - t.datetime "updated_at" - t.string "remember_me_token" - t.datetime "remember_me_token_expires_at" - t.string "reset_password_token" - t.datetime "reset_password_token_expires_at" - t.datetime "reset_password_email_sent_at" - t.string "activation_state" - t.string "activation_token" - t.datetime "activation_token_expires_at" - t.integer "failed_logins_count", default: 0 - t.datetime "lock_expires_at" - t.string "unlock_token" - t.string "avatar" - t.text "about_me" - t.string "role" - t.string "firstname" - t.string "lastname" - end - - add_index "users", ["activation_token"], name: "index_users_on_activation_token", using: :btree - add_index "users", ["remember_me_token"], name: "index_users_on_remember_me_token", using: :btree - add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", using: :btree - - create_table "versions", force: true do |t| - t.string "item_type" - t.integer "item_id" - t.string "event" - t.string "whodunnit" - t.text "object" - t.datetime "created_at" - t.text "value" - end - - create_table "workshop_facilitators", force: true do |t| - t.integer "user_id" - t.integer "workshop_id" - t.string "role" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "workshop_presentation_styles", force: true do |t| - t.string "name" - t.string "slug" - t.string "info" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "order" - end - - create_table "workshop_requested_resources", force: true do |t| - t.integer "workshop_id" - t.integer "workshop_resource_id" - t.string "status" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "workshop_resources", force: true do |t| - t.string "name" - t.string "slug" - t.string "info" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "workshop_streams", force: true do |t| - t.string "name" - t.string "slug" - t.string "info" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "order" - end - - create_table "workshops", force: true do |t| - t.string "title" - t.string "slug" - t.text "info" - t.integer "conference_id" - t.integer "workshop_stream_id" - t.integer "workshop_presentation_style" - t.integer "min_facilitators" - t.integer "location_id" - t.datetime "start_time" - t.datetime "end_time" - t.datetime "created_at" - t.datetime "updated_at" - end - -end +# 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: 20140725001300) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "authentications", force: true do |t| + t.integer "user_id", null: false + t.string "provider", null: false + t.string "uid", null: false + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "conference_admins", force: true do |t| + t.integer "conference_id" + t.integer "user_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "conference_host_organizations", force: true do |t| + t.integer "conference_id" + t.integer "organization_id" + t.integer "order" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "conference_registration_form_fields", force: true do |t| + t.integer "conference_id" + t.integer "registration_form_field_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "position" + end + + create_table "conference_registration_responses", force: true do |t| + t.integer "conference_registration_id" + t.integer "registration_form_field_id" + t.text "data" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "conference_registrations", force: true do |t| + t.integer "conference_id" + t.integer "user_id" + t.string "is_attending" + t.datetime "created_at" + t.datetime "updated_at" + t.boolean "is_confirmed" + t.boolean "is_participant" + t.boolean "is_volunteer" + t.string "confirmation_token" + t.binary "data" + t.string "email" + t.boolean "complete" + t.boolean "completed" + t.string "payment_confirmation_token" + t.string "payment_info" + t.integer "registration_fees_paid" + end + + create_table "conference_types", force: true do |t| + t.string "title" + t.string "info" + t.datetime "created_at" + t.datetime "updated_at" + t.string "slug" + end + + create_table "conferences", force: true do |t| + t.string "title" + t.string "slug" + t.datetime "start_date" + t.datetime "end_date" + t.text "info" + t.string "poster" + t.string "cover" + t.boolean "workshop_schedule_published" + t.boolean "registration_open" + t.boolean "meals_provided" + t.text "meal_info" + t.text "travel_info" + t.integer "conference_type_id" + t.datetime "created_at" + t.datetime "updated_at" + t.text "preregistration_info" + t.text "registration_info" + t.text "postregistration_info" + t.integer "cover_attribution_id" + t.string "cover_attribution_name" + t.string "cover_attribution_src" + t.integer "cover_attribution_user_id" + end + + create_table "event_types", force: true do |t| + t.string "slug" + t.text "info" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "events", force: true do |t| + t.string "title" + t.string "slug" + t.integer "event_type_id" + t.integer "conference_id" + t.text "info" + t.integer "location_id" + t.datetime "start_time" + t.datetime "end_time" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "locations", force: true do |t| + t.string "title" + t.float "latitude" + t.float "longitude" + t.datetime "created_at" + t.datetime "updated_at" + t.string "country" + t.string "territory" + t.string "city" + t.string "street" + t.string "postal_code" + end + + add_index "locations", ["latitude", "longitude"], name: "index_locations_on_latitude_and_longitude", using: :btree + + create_table "locations_organizations", id: false, force: true do |t| + t.integer "organization_id" + t.integer "location_id" + end + + add_index "locations_organizations", ["organization_id", "location_id"], name: "loc_org_index", using: :btree + + create_table "organization_statuses", force: true do |t| + t.string "name" + t.string "slug" + t.string "info" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "organizations", force: true do |t| + t.string "name" + t.string "slug" + t.string "email_address" + t.string "url" + t.integer "year_founded" + t.text "info" + t.string "logo" + t.string "avatar" + t.boolean "requires_approval" + t.string "secret_question" + t.string "secret_answer" + t.integer "user_organization_replationship_id" + t.datetime "created_at" + t.datetime "updated_at" + t.string "cover" + t.integer "cover_attribution_id" + t.string "cover_attribution_name" + t.string "cover_attribution_src" + t.string "phone" + t.integer "organization_status_id" + t.integer "cover_attribution_user_id" + end + + create_table "registration_form_fields", force: true do |t| + t.string "title" + t.text "help" + t.boolean "required" + t.string "field_type" + t.string "options" + t.boolean "is_retired" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "sessions", force: true do |t| + t.string "session_id", null: false + t.text "data" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", unique: true, using: :btree + add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree + + create_table "translations", force: true do |t| + t.string "locale" + t.string "key" + t.text "value" + t.text "interpolations" + t.boolean "is_proc", default: false + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "user_organization_relationships", force: true do |t| + t.integer "user_id" + t.integer "organization_id" + t.string "relationship" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "users", force: true do |t| + t.string "username", null: false + t.string "email" + t.string "crypted_password" + t.string "salt" + t.datetime "created_at" + t.datetime "updated_at" + t.string "remember_me_token" + t.datetime "remember_me_token_expires_at" + t.string "reset_password_token" + t.datetime "reset_password_token_expires_at" + t.datetime "reset_password_email_sent_at" + t.string "activation_state" + t.string "activation_token" + t.datetime "activation_token_expires_at" + t.integer "failed_logins_count", default: 0 + t.datetime "lock_expires_at" + t.string "unlock_token" + t.string "avatar" + t.text "about_me" + t.string "role" + t.string "firstname" + t.string "lastname" + end + + add_index "users", ["activation_token"], name: "index_users_on_activation_token", using: :btree + add_index "users", ["remember_me_token"], name: "index_users_on_remember_me_token", using: :btree + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", using: :btree + + create_table "versions", force: true do |t| + t.string "item_type" + t.integer "item_id" + t.string "event" + t.string "whodunnit" + t.text "object" + t.datetime "created_at" + t.string "value" + end + + create_table "workshop_facilitators", force: true do |t| + t.integer "user_id" + t.integer "workshop_id" + t.string "role" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "workshop_presentation_styles", force: true do |t| + t.string "name" + t.string "slug" + t.string "info" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "order" + end + + create_table "workshop_requested_resources", force: true do |t| + t.integer "workshop_id" + t.integer "workshop_resource_id" + t.string "status" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "workshop_resources", force: true do |t| + t.string "name" + t.string "slug" + t.string "info" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "workshop_streams", force: true do |t| + t.string "name" + t.string "slug" + t.string "info" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "order" + end + + create_table "workshops", force: true do |t| + t.string "title" + t.string "slug" + t.text "info" + t.integer "conference_id" + t.integer "workshop_stream_id" + t.integer "workshop_presentation_style" + t.integer "min_facilitators" + t.integer "location_id" + t.datetime "start_time" + t.datetime "end_time" + t.datetime "created_at" + t.datetime "updated_at" + end + +end