diff --git a/realtime-validations-simple/Gemfile b/realtime-validations-simple/Gemfile index 6792c9f..6169aa4 100644 --- a/realtime-validations-simple/Gemfile +++ b/realtime-validations-simple/Gemfile @@ -1,15 +1,14 @@ source 'https://rubygems.org' -gem 'rails' +gem 'rails', '~> 3.1.3' gem 'sqlite3' group :assets do - gem 'sass-rails', '~> 3.2.0' - gem 'coffee-rails', '~> 3.2.0' - + gem 'sass-rails', '~> 3.1.5' + gem 'coffee-rails', '~> 3.1.1' gem 'uglifier', '>= 1.0.3' end gem 'jquery-rails' -gem 'realtime-validations', '~> 0.0.4' +gem 'realtime-validations', '~> 0.2.3' diff --git a/realtime-validations-simple/Gemfile.lock b/realtime-validations-simple/Gemfile.lock index c5aa5dd..c19ccb0 100644 --- a/realtime-validations-simple/Gemfile.lock +++ b/realtime-validations-simple/Gemfile.lock @@ -1,40 +1,39 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.0.rc1) - actionpack (= 3.2.0.rc1) + actionmailer (3.1.3) + actionpack (= 3.1.3) mail (~> 2.3.0) - actionpack (3.2.0.rc1) - activemodel (= 3.2.0.rc1) - activesupport (= 3.2.0.rc1) + actionpack (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) - journey (~> 1.0.0.rc1) rack (~> 1.3.5) rack-cache (~> 1.1) + rack-mount (~> 0.8.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.0.rc1) - activesupport (= 3.2.0.rc1) + sprockets (~> 2.0.3) + activemodel (3.1.3) + activesupport (= 3.1.3) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.2.0.rc1) - activemodel (= 3.2.0.rc1) - activesupport (= 3.2.0.rc1) - arel (~> 3.0.0.rc1) + activerecord (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) + arel (~> 2.2.1) tzinfo (~> 0.3.29) - activeresource (3.2.0.rc1) - activemodel (= 3.2.0.rc1) - activesupport (= 3.2.0.rc1) - activesupport (3.2.0.rc1) - i18n (~> 0.6) + activeresource (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) + activesupport (3.1.3) multi_json (~> 1.0) - arel (3.0.0.rc1) + arel (2.2.1) builder (3.0.0) - coffee-rails (3.2.0) + coffee-rails (3.1.1) coffee-script (>= 2.2.0) - railties (~> 3.2.0.beta) + railties (~> 3.1.0) coffee-script (2.2.0) coffee-script-source execjs @@ -44,9 +43,8 @@ GEM multi_json (~> 1.0) hike (1.2.1) i18n (0.6.0) - journey (1.0.0.rc4) - jquery-rails (2.0.0) - railties (>= 3.2.0.beta, < 5.0) + jquery-rails (1.0.19) + railties (~> 3.0) thor (~> 0.14) json (1.6.4) mail (2.3.0) @@ -59,21 +57,23 @@ GEM rack (1.3.6) rack-cache (1.1) rack (>= 0.4) + rack-mount (0.8.3) + rack (>= 1.0.0) rack-ssl (1.3.2) rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.0.rc1) - actionmailer (= 3.2.0.rc1) - actionpack (= 3.2.0.rc1) - activerecord (= 3.2.0.rc1) - activeresource (= 3.2.0.rc1) - activesupport (= 3.2.0.rc1) + rails (3.1.3) + actionmailer (= 3.1.3) + actionpack (= 3.1.3) + activerecord (= 3.1.3) + activeresource (= 3.1.3) + activesupport (= 3.1.3) bundler (~> 1.0) - railties (= 3.2.0.rc1) - railties (3.2.0.rc1) - actionpack (= 3.2.0.rc1) - activesupport (= 3.2.0.rc1) + railties (= 3.1.3) + railties (3.1.3) + actionpack (= 3.1.3) + activesupport (= 3.1.3) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -81,14 +81,16 @@ GEM rake (0.9.2.2) rdoc (3.12) json (~> 1.4) - realtime-validations (0.0.4) + realtime-validations (0.2.3) + jquery-rails (>= 1.0.19) rails (>= 3.1.3) sass (3.1.12) - sass-rails (3.2.2) - railties (~> 3.2.0.beta) - sass (>= 3.1.10) - tilt (~> 1.3) - sprockets (2.1.2) + sass-rails (3.1.5) + actionpack (~> 3.1.0) + railties (~> 3.1.0) + sass (~> 3.1.10) + tilt (~> 1.3.2) + sprockets (2.0.3) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -107,10 +109,10 @@ PLATFORMS ruby DEPENDENCIES - coffee-rails (~> 3.2.0) + coffee-rails (~> 3.1.1) jquery-rails - rails - realtime-validations (~> 0.0.4) - sass-rails (~> 3.2.0) + rails (~> 3.1.3) + realtime-validations (~> 0.2.3) + sass-rails (~> 3.1.5) sqlite3 uglifier (>= 1.0.3) diff --git a/realtime-validations-simple/app/assets/javascripts/application.js b/realtime-validations-simple/app/assets/javascripts/application.js index 9097d83..07f1d1c 100644 --- a/realtime-validations-simple/app/assets/javascripts/application.js +++ b/realtime-validations-simple/app/assets/javascripts/application.js @@ -1,15 +1,4 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// the compiled file. -// -// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD -// GO AFTER THE REQUIRES BELOW. -// //= require jquery //= require jquery_ujs +//= require realtime_validations //= require_tree . diff --git a/realtime-validations-simple/app/assets/javascripts/realtime_validations.custom.js b/realtime-validations-simple/app/assets/javascripts/realtime_validations.custom.js new file mode 100644 index 0000000..2d97d91 --- /dev/null +++ b/realtime-validations-simple/app/assets/javascripts/realtime_validations.custom.js @@ -0,0 +1,9 @@ +RealtimeValidations.customFields = function() { + return { }; +} + +// RealtimeValidations.showErrors = function(field, errors) { +// } + +// RealtimeValidations.hideErrors = function(field) { +// } diff --git a/realtime-validations-simple/app/assets/javascripts/realtime_validations.js b/realtime-validations-simple/app/assets/javascripts/realtime_validations.js deleted file mode 100644 index abcd250..0000000 --- a/realtime-validations-simple/app/assets/javascripts/realtime_validations.js +++ /dev/null @@ -1,3 +0,0 @@ -function rt_validations_custom_fields() { - return {}; -} \ No newline at end of file diff --git a/realtime-validations-simple/app/assets/stylesheets/application.css b/realtime-validations-simple/app/assets/stylesheets/application.css index 3b5cc66..91a12b1 100644 --- a/realtime-validations-simple/app/assets/stylesheets/application.css +++ b/realtime-validations-simple/app/assets/stylesheets/application.css @@ -9,5 +9,6 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self + *= require realtime_validations *= require_tree . */ diff --git a/realtime-validations-simple/config/environments/development.rb b/realtime-validations-simple/config/environments/development.rb index 7babc1d..de5f707 100644 --- a/realtime-validations-simple/config/environments/development.rb +++ b/realtime-validations-simple/config/environments/development.rb @@ -22,13 +22,6 @@ # Only use best-standards-support built into browsers config.action_dispatch.best_standards_support = :builtin - # Raise exception on mass assignment protection for ActiveRecord models - config.active_record.mass_assignment_sanitizer = :strict - - # Log the query plan for queries taking more than this (works - # with SQLite, MySQL, and PostgreSQL) - config.active_record.auto_explain_threshold_in_seconds = 0.5 - # Do not compress assets config.assets.compress = false diff --git a/realtime-validations-simple/config/environments/production.rb b/realtime-validations-simple/config/environments/production.rb index aa9984a..7517fc3 100644 --- a/realtime-validations-simple/config/environments/production.rb +++ b/realtime-validations-simple/config/environments/production.rb @@ -60,8 +60,4 @@ # Send deprecation notices to registered listeners config.active_support.deprecation = :notify - - # Log the query plan for queries taking more than this (works - # with SQLite, MySQL, and PostgreSQL) - # config.active_record.auto_explain_threshold_in_seconds = 0.5 end diff --git a/realtime-validations-simple/config/environments/test.rb b/realtime-validations-simple/config/environments/test.rb index d16382b..fb14822 100644 --- a/realtime-validations-simple/config/environments/test.rb +++ b/realtime-validations-simple/config/environments/test.rb @@ -29,9 +29,6 @@ # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test - # Raise exception on mass assignment protection for ActiveRecord models - config.active_record.mass_assignment_sanitizer = :strict - # Print deprecation notices to the stderr config.active_support.deprecation = :stderr end