Permalink
Browse files

rails 3.1 upgrade - still buggy

  • Loading branch information...
1 parent f547a75 commit 250f42550934573e165b6e9de5d6e78539974971 @matchu matchu committed Mar 5, 2013
Showing with 107 additions and 81 deletions.
  1. +3 −4 Gemfile
  2. +86 −74 Gemfile.lock
  3. +3 −0 app/models/swf_asset.rb
  4. 0 bundle
  5. +0 −1 config/environments/development.rb
  6. +1 −1 config/initializers/session_store.rb
  7. +13 −0 config/initializers/wrap_parameters.rb
  8. +1 −1 config/routes.rb
  9. 0 isntall
  10. BIN vendor/cache/abstract-1.0.0.gem
  11. BIN vendor/cache/actionmailer-3.0.20.gem
  12. BIN vendor/cache/actionmailer-3.1.11.gem
  13. BIN vendor/cache/actionpack-3.0.20.gem
  14. BIN vendor/cache/actionpack-3.1.11.gem
  15. BIN vendor/cache/activemodel-3.0.20.gem
  16. BIN vendor/cache/activemodel-3.1.11.gem
  17. BIN vendor/cache/activerecord-3.0.20.gem
  18. BIN vendor/cache/activerecord-3.1.11.gem
  19. BIN vendor/cache/activeresource-3.0.20.gem
  20. BIN vendor/cache/activeresource-3.1.11.gem
  21. BIN vendor/cache/activesupport-3.0.20.gem
  22. BIN vendor/cache/activesupport-3.1.11.gem
  23. BIN vendor/cache/addressable-2.3.2.gem
  24. BIN vendor/cache/addressable-2.3.3.gem
  25. BIN vendor/cache/arel-2.0.10.gem
  26. BIN vendor/cache/arel-2.2.3.gem
  27. BIN vendor/cache/builder-2.1.2.gem
  28. BIN vendor/cache/builder-3.0.4.gem
  29. BIN vendor/cache/diff-lcs-1.1.3.gem
  30. BIN vendor/cache/diff-lcs-1.2.1.gem
  31. BIN vendor/cache/erubis-2.6.6.gem
  32. BIN vendor/cache/erubis-2.7.0.gem
  33. BIN vendor/cache/excon-0.16.10.gem
  34. BIN vendor/cache/excon-0.19.3.gem
  35. BIN vendor/cache/hike-1.2.1.gem
  36. BIN vendor/cache/i18n-0.5.0.gem
  37. BIN vendor/cache/i18n-0.6.4.gem
  38. BIN vendor/cache/mail-2.2.19.gem
  39. BIN vendor/cache/mail-2.3.3.gem
  40. BIN vendor/cache/mime-types-1.19.gem
  41. BIN vendor/cache/mime-types-1.21.gem
  42. BIN vendor/cache/mini_magick-3.4.gem
  43. BIN vendor/cache/mini_magick-3.5.0.gem
  44. BIN vendor/cache/mysql2-0.2.18.gem
  45. BIN vendor/cache/mysql2-0.3.11.gem
  46. BIN vendor/cache/net-ssh-2.6.3.gem
  47. BIN vendor/cache/net-ssh-2.6.6.gem
  48. BIN vendor/cache/newrelic_rpm-3.5.5.38.gem
  49. BIN vendor/cache/newrelic_rpm-3.5.8.70.gem
  50. BIN vendor/cache/paper_trail-2.7.0.gem
  51. BIN vendor/cache/paper_trail-2.7.1.gem
  52. BIN vendor/cache/rack-1.2.7.gem
  53. BIN vendor/cache/rack-1.3.10.gem
  54. BIN vendor/cache/rack-cache-1.2.gem
  55. BIN vendor/cache/rack-mount-0.6.14.gem
  56. BIN vendor/cache/rack-mount-0.8.3.gem
  57. BIN vendor/cache/rack-protection-1.4.0.gem
  58. BIN vendor/cache/rack-ssl-1.3.3.gem
  59. BIN vendor/cache/rack-test-0.5.7.gem
  60. BIN vendor/cache/rack-test-0.6.2.gem
  61. BIN vendor/cache/{rails-3.0.20.gem → rails-3.1.11.gem}
  62. BIN vendor/cache/railties-3.0.20.gem
  63. BIN vendor/cache/railties-3.1.11.gem
  64. BIN vendor/cache/rdoc-3.12.2.gem
  65. BIN vendor/cache/rdoc-3.12.gem
  66. BIN vendor/cache/redis-3.0.2.gem
  67. BIN vendor/cache/redis-3.0.3.gem
  68. BIN vendor/cache/resque-scheduler-2.0.0.e.gem
  69. BIN vendor/cache/resque-scheduler-2.0.0.gem
  70. BIN vendor/cache/sinatra-1.2.8.gem
  71. BIN vendor/cache/sinatra-1.3.3.gem
  72. BIN vendor/cache/sprockets-2.0.4.gem
  73. BIN vendor/cache/tilt-1.3.3.gem
  74. BIN vendor/cache/tilt-1.3.4.gem
  75. BIN vendor/cache/tzinfo-0.3.35.gem
  76. BIN vendor/cache/tzinfo-0.3.36.gem
  77. BIN vendor/cache/yard-0.8.3.gem
  78. BIN vendor/cache/yard-0.8.5.2.gem
View
@@ -1,7 +1,8 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.20'
+gem 'rails', '= 3.1.11'
#gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
+gem 'mysql2', '>= 0.3.11'
# https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion
gem 'json', '~> 1.7.7'
@@ -86,12 +87,10 @@ group :development_async do
end
group :production do
- gem 'mysql2', '< 0.3'
gem 'memcache-client', '~> 1.8.5', :require => 'memcache'
end
group :test do
gem 'factory_girl_rails', '~> 1.0'
gem 'rspec-rails', '~> 2.0.0.beta.22'
-end
-
+end
View
@@ -1,8 +1,8 @@
GIT
remote: git://github.com/eventmachine/eventmachine.git
- revision: d7c8a14dc494193a775add4b16c1e303cab5b285
+ revision: c520f9de3969f6f39aa5f4439f825a63dd8c0f85
specs:
- eventmachine (1.0.0)
+ eventmachine (1.0.1)
GIT
remote: git://github.com/iain/http_accept_language.git
@@ -30,9 +30,9 @@ GIT
GIT
remote: git://github.com/igrigorik/em-synchrony.git
- revision: fe592a4b9b5345bca329477cb8f2f8d186b6fc7f
+ revision: 44c3cea84baf13a29f03ddb15c5040ec7703506f
specs:
- em-synchrony (1.0.2)
+ em-synchrony (1.0.3)
eventmachine (>= 1.0.0.beta.1)
GIT
@@ -68,7 +68,7 @@ GIT
GIT
remote: git://github.com/rubyamf/rocketamf.git
- revision: ed82db7659f624d6c3ca244e4127dad270a484c7
+ revision: 3f16cf841d9c36045f720b307bbffa61fb63a7ac
specs:
RocketAMF (1.0.0)
@@ -79,37 +79,38 @@ GEM
Platform (>= 0.4.0)
open4
Platform (0.4.0)
- abstract (1.0.0)
- actionmailer (3.0.20)
- actionpack (= 3.0.20)
- mail (~> 2.2.19)
- actionpack (3.0.20)
- activemodel (= 3.0.20)
- activesupport (= 3.0.20)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.5.0)
- rack (~> 1.2.5)
- rack-mount (~> 0.6.14)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.20)
- activesupport (= 3.0.20)
- builder (~> 2.1.2)
- i18n (~> 0.5.0)
- activerecord (3.0.20)
- activemodel (= 3.0.20)
- activesupport (= 3.0.20)
- arel (~> 2.0.10)
- tzinfo (~> 0.3.23)
- activeresource (3.0.20)
- activemodel (= 3.0.20)
- activesupport (= 3.0.20)
- activesupport (3.0.20)
- addressable (2.3.2)
- arel (2.0.10)
+ actionmailer (3.1.11)
+ actionpack (= 3.1.11)
+ mail (~> 2.3.3)
+ actionpack (3.1.11)
+ activemodel (= 3.1.11)
+ activesupport (= 3.1.11)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6)
+ rack (~> 1.3.6)
+ rack-cache (~> 1.2)
+ rack-mount (~> 0.8.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.0.4)
+ activemodel (3.1.11)
+ activesupport (= 3.1.11)
+ builder (~> 3.0.0)
+ i18n (~> 0.6)
+ activerecord (3.1.11)
+ activemodel (= 3.1.11)
+ activesupport (= 3.1.11)
+ arel (~> 2.2.3)
+ tzinfo (~> 0.3.29)
+ activeresource (3.1.11)
+ activemodel (= 3.1.11)
+ activesupport (= 3.1.11)
+ activesupport (3.1.11)
+ multi_json (~> 1.0)
+ addressable (2.3.3)
+ arel (2.2.3)
bcrypt-ruby (2.1.4)
- builder (2.1.2)
+ builder (3.0.4)
bullet (4.1.6)
uniform_notifier (~> 1.0.0)
carrierwave (0.5.8)
@@ -122,13 +123,12 @@ GEM
devise (1.1.9)
bcrypt-ruby (~> 2.1.2)
warden (~> 1.0.2)
- diff-lcs (1.1.3)
+ diff-lcs (1.2.1)
dye (0.1.4)
em-socksify (0.2.1)
eventmachine (>= 1.0.0.beta.4)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- excon (0.16.10)
+ erubis (2.7.0)
+ excon (0.19.3)
factory_girl (2.6.4)
activesupport (>= 2.3.9)
factory_girl_rails (1.7.0)
@@ -146,35 +146,35 @@ GEM
ruby-hmac
formatador (0.2.4)
haml (3.0.25)
+ hike (1.2.1)
hoptoad_notifier (2.4.11)
activesupport
builder
http_parser.rb (0.5.3)
- i18n (0.5.0)
+ i18n (0.6.4)
jammit (0.6.5)
yui-compressor (>= 0.9.3)
json (1.7.7)
- mail (2.2.19)
- activesupport (>= 2.3.6)
+ mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
memcache-client (1.8.5)
- mime-types (1.19)
- mini_magick (3.4)
+ mime-types (1.21)
+ mini_magick (3.5.0)
subexec (~> 0.2.1)
msgpack (0.5.3)
multi_json (1.3.7)
- mysql2 (0.2.18)
+ mysql2 (0.3.11)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
- net-ssh (2.6.3)
- newrelic_rpm (3.5.5.38)
+ net-ssh (2.6.6)
+ newrelic_rpm (3.5.8.70)
nokogiri (1.5.6)
open4 (1.3.0)
openneo-auth-signatory (0.1.0)
ruby-hmac
- paper_trail (2.7.0)
+ paper_trail (2.7.1)
activerecord (~> 3.0)
railties (~> 3.0)
parallel (0.5.21)
@@ -184,33 +184,40 @@ GEM
prompter (0.1.5)
dye (>= 0.1.1)
yard (>= 0.6.3)
- rack (1.2.7)
+ rack (1.3.10)
+ rack-cache (1.2)
+ rack (>= 0.4)
rack-fiber_pool (0.9.2)
- rack-mount (0.6.14)
+ rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-test (0.5.7)
+ rack-protection (1.4.0)
+ rack
+ rack-ssl (1.3.3)
+ rack
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.0.20)
- actionmailer (= 3.0.20)
- actionpack (= 3.0.20)
- activerecord (= 3.0.20)
- activeresource (= 3.0.20)
- activesupport (= 3.0.20)
+ rails (3.1.11)
+ actionmailer (= 3.1.11)
+ actionpack (= 3.1.11)
+ activerecord (= 3.1.11)
+ activeresource (= 3.1.11)
+ activesupport (= 3.1.11)
bundler (~> 1.0)
- railties (= 3.0.20)
+ railties (= 3.1.11)
rails-i18n (0.7.2)
i18n (~> 0.5)
- railties (3.0.20)
- actionpack (= 3.0.20)
- activesupport (= 3.0.20)
+ railties (3.1.11)
+ actionpack (= 3.1.11)
+ activesupport (= 3.1.11)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.4)
+ thor (~> 0.14.6)
rake (10.0.3)
rdiscount (1.6.8)
- rdoc (3.12)
+ rdoc (3.12.2)
json (~> 1.4)
- redis (3.0.2)
+ redis (3.0.3)
redis-namespace (1.2.1)
redis (~> 3.0.0)
resque (1.23.0)
@@ -221,9 +228,9 @@ GEM
resque-retry (0.1.0)
resque (>= 1.8.0)
resque-scheduler (>= 1.8.0)
- resque-scheduler (2.0.0.e)
+ resque-scheduler (2.0.0)
redis (>= 2.0.1)
- resque (>= 1.15.0)
+ resque (>= 1.20.0)
rufus-scheduler
rest-client (1.6.7)
mime-types (>= 1.16)
@@ -247,17 +254,22 @@ GEM
tzinfo (>= 0.3.23)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
- sinatra (1.2.8)
- rack (~> 1.1)
- tilt (>= 1.2.2, < 2.0)
+ sinatra (1.3.3)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
+ tilt (~> 1.3, >= 1.3.3)
+ sprockets (2.0.4)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
subexec (0.2.2)
swf_converter (0.0.3)
thor (0.14.6)
- tilt (1.3.3)
+ tilt (1.3.4)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.35)
+ tzinfo (0.3.36)
uniform_notifier (1.0.2)
vegas (0.1.11)
rack (>= 1.0.0)
@@ -267,7 +279,7 @@ GEM
activesupport (>= 2.3.4)
chronic (~> 0.6.3)
will_paginate (3.0.4)
- yard (0.8.3)
+ yard (0.8.5.2)
yui-compressor (0.9.6)
POpen4 (>= 0.1.4)
@@ -298,7 +310,7 @@ DEPENDENCIES
memcache-client (~> 1.8.5)
mini_magick (~> 3.4)
msgpack (~> 0.5.3)
- mysql2 (< 0.3)
+ mysql2 (>= 0.3.11)
mysqlplus!
neopets (~> 0.2.0)!
newrelic_rpm
@@ -307,7 +319,7 @@ DEPENDENCIES
parallel (~> 0.5.17)
patron (~> 0.4.18)
rack-fiber_pool
- rails (= 3.0.20)
+ rails (= 3.1.11)
rails-i18n
rdiscount (~> 1.6.5)
resque (~> 1.23.0)
@@ -201,6 +201,7 @@ def as_json(options={})
end
def body_specific?
+ Rails.logger.debug("my zone id is: #{zone_id}")
self.zone.type_id < 3 || (@item && @item.body_specific?)
end
@@ -209,13 +210,15 @@ def origin_pet_type=(pet_type)
end
def origin_biology_data=(data)
+ Rails.logger.debug("my biology data is: #{data.inspect}")
self.type = 'biology'
self.zone_id = data[:zone_id].to_i
self.url = data[:asset_url]
self.zones_restrict = data[:zones_restrict]
end
def origin_object_data=(data)
+ Rails.logger.debug("my object data is: #{data.inspect}")
self.type = 'object'
self.zone_id = data[:zone_id].to_i
self.url = data[:asset_url]
View
No changes.
@@ -11,7 +11,6 @@
# Show full error reports and disable caching
config.consider_all_requests_local = true
- config.action_view.debug_rjs = true
config.action_controller.perform_caching = true
# Don't care if the mailer can't send
@@ -1,7 +1,7 @@
# Be sure to restart your server when you modify this file.
Rails.application.config.session_store :cookie_store, {
- :key => '_openneo-impress-items_session',
+ :key => '_openneo_impress_session',
}
# Use the database for sessions instead of the cookie-based default,
@@ -0,0 +1,13 @@
+# Be sure to restart your server when you modify this file.
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+ wrap_parameters format: [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+ self.include_root_in_json = false
+end
View
@@ -1,4 +1,4 @@
-OpenneoImpressItems::Application.routes.draw do |map|
+OpenneoImpressItems::Application.routes.draw do
get "petpages/new"
get "closet_lists/new"
View
No changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 250f425

Please sign in to comment.