Merge pull request #13 from peerend/master

Cleaner Database done in fork, added .gitignore for database.yml, includes database.yml.example instead.

.gitignore

@@ -68,3 +68,5 @@ brakeman.html
 # Ignore sensitive data
 /config/settings/local.rb
 /nbproject/private/
+<<<<<<< HEAD
+/config/database.yml

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'

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

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

config/database.yml → 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
+

db/schema.rb

@@ -213,8 +213,8 @@ ActiveRecord::Schema.define(version: 20140725001300) do
   end
 
   create_table "user_organization_relationships", force: true do |t|
-    t.integer  "user_id",         null: false
-    t.integer  "organization_id", null: false
+    t.integer  "user_id"
+    t.integer  "organization_id"
     t.string   "relationship"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -256,7 +256,7 @@ ActiveRecord::Schema.define(version: 20140725001300) do
     t.string   "whodunnit"
     t.text     "object"
     t.datetime "created_at"
-    t.text     "value"
+    t.string   "value"
   end
 
   create_table "workshop_facilitators", force: true do |t|