Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated some gems to get form validations working properly.

  • Loading branch information...
commit ff92893608c4748e12672dc5e1a84769f4928fb5 1 parent fa520e4
@dmorrill10 authored
View
8 Gemfile
@@ -5,6 +5,8 @@ gem 'rails', '3.2.6'
gem 'rack', '1.4.1'
# Database module
+gem 'origin'
+gem 'moped'
gem "mongoid"
gem 'bson'
gem 'bson_ext'
@@ -102,12 +104,12 @@ gem 'acpc_dealer'
gem 'acpc_dealer_data'
# Improved forms
-gem 'simple_form', "~> 1.5"
+gem 'simple_form'
# Instant form validation
-gem 'client_side_validations', '~> 3.2.0.beta.1'
+gem 'client_side_validations'
gem 'client_side_validations-simple_form'
-gem 'client_side_validations-mongoid', '~> 2.4.0.beta.2'
+gem 'client_side_validations-mongoid'
# Improved logging output
gem 'awesome_print'
View
43 Gemfile.lock
@@ -52,7 +52,7 @@ GEM
multi_json (~> 1.0)
addressable (2.2.8)
arel (3.0.2)
- awesome_print (1.0.2)
+ awesome_print (1.1.0)
beanstalk-client (1.1.1)
blueprint-rails (0.1.2)
railties (~> 3.0)
@@ -63,7 +63,7 @@ GEM
bson (1.6.4)
bson_ext (1.6.4)
bson (~> 1.6.4)
- builder (3.0.2)
+ builder (3.0.4)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -76,13 +76,13 @@ GEM
childprocess (0.3.2)
ffi (~> 1.0.6)
chunky_png (1.2.5)
- client_side_validations (3.2.0.beta.3)
- client_side_validations-mongoid (2.4.0.beta.2)
- client_side_validations (~> 3.2.0.beta.1)
- mongoid (~> 2.4.0)
- client_side_validations-simple_form (1.5.0.beta.3)
- client_side_validations (~> 3.2.0.beta.1)
- simple_form (~> 1.5.0)
+ client_side_validations (3.2.1)
+ client_side_validations-mongoid (3.0.1)
+ client_side_validations (~> 3.2.0)
+ mongoid (~> 3.0.0)
+ client_side_validations-simple_form (2.0.1)
+ client_side_validations (~> 3.2.0)
+ simple_form (~> 2.0.3)
clive (1.2.0)
coffee-filter (0.1.1)
coffee-script (>= 2.2.0)
@@ -145,17 +145,14 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- mongo (1.6.2)
- bson (~> 1.6.2)
- mongoid (2.4.11)
- activemodel (~> 3.1)
- mongo (<= 1.6.2)
- tzinfo (~> 0.3.22)
- multi_json (1.3.6)
+ mongoid (3.0.14)
+ moped (1.3.0)
+ multi_json (1.3.7)
nifty-generators (0.4.6)
nokogiri (1.5.5)
oily_png (1.0.2)
chunky_png (~> 1.2.1)
+ origin (1.0.11)
passenger (3.0.13)
daemon_controller (>= 1.0.0)
fastthread (>= 1.0.1)
@@ -169,7 +166,7 @@ GEM
rack (>= 0.4)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.6)
actionmailer (= 3.2.6)
@@ -216,7 +213,7 @@ GEM
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- simple_form (1.5.2)
+ simple_form (2.0.4)
actionpack (~> 3.0)
activemodel (~> 3.0)
simplecov (0.6.4)
@@ -242,7 +239,7 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.35)
uglifier (1.2.5)
execjs (>= 0.3.0)
multi_json (~> 1.3)
@@ -267,8 +264,8 @@ DEPENDENCIES
bson_ext
capybara
chunky_png
- client_side_validations (~> 3.2.0.beta.1)
- client_side_validations-mongoid (~> 2.4.0.beta.2)
+ client_side_validations
+ client_side_validations-mongoid
client_side_validations-simple_form
coffee-filter
coffee-rails
@@ -282,8 +279,10 @@ DEPENDENCIES
jquery-ui-rails
launchy
mongoid
+ moped
nifty-generators
oily_png
+ origin
passenger
rack (= 1.4.1)
rack-asset-compiler
@@ -292,7 +291,7 @@ DEPENDENCIES
rspec
rspec-rails
sass-rails
- simple_form (~> 1.5)
+ simple_form
simplecov
stalker
therubyracer
View
32 config/mongoid.yml
@@ -1,24 +1,16 @@
development:
- host: localhost
database: acpc_poker_gui_client_development
+ sessions:
+ default:
+ hosts:
+ - localhost:27017
+ database: acpc_poker_gui_client_development
-test:
- host: localhost
- database: acpc_poker_gui_client_test
-
-
-# set these environment variables on your prod server
production:
- # @todo Not sure what these should be set to
- #host: <%= ENV['MONGOID_HOST'] %>
- #port: <%= ENV['MONGOID_PORT'] %>
- #username: <%= ENV['MONGOID_USERNAME'] %>
- #password: <%= ENV['MONGOID_PASSWORD'] %>
- #database: <%= ENV['MONGOID_DATABASE'] %>
- # slaves:
- # - host: slave1.local
- # port: 27018
- # - host: slave2.local
- # port: 27019
- host: localhost
- database: acpc_poker_gui_client_development
+ database: acpc_poker_gui_client_development
+ sessions:
+ default:
+ database: acpc_poker_gui_client_development
+ hosts:
+ - localhost:27017
+
View
1  lib/database_config.rb
@@ -2,4 +2,5 @@
ENV["RACK_ENV"] = ENV.fetch("RACK_ENV", "development")
RAILS_ROOT = File.expand_path("../../", __FILE__)
Mongoid.logger = nil
+Moped.logger = nil
Mongoid.load!("#{RAILS_ROOT}/config/mongoid.yml")
Please sign in to comment.
Something went wrong with that request. Please try again.