diff --git a/Gemfile b/Gemfile index 58d4afea..32d3cb00 100644 --- a/Gemfile +++ b/Gemfile @@ -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 \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 2e99b954..7e3a3a6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/app/models/swf_asset.rb b/app/models/swf_asset.rb index 8b8e1f9c..9582156b 100644 --- a/app/models/swf_asset.rb +++ b/app/models/swf_asset.rb @@ -201,6 +201,7 @@ class SwfAsset < ActiveRecord::Base end def body_specific? + Rails.logger.debug("my zone id is: #{zone_id}") self.zone.type_id < 3 || (@item && @item.body_specific?) end @@ -209,6 +210,7 @@ class SwfAsset < ActiveRecord::Base 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] @@ -216,6 +218,7 @@ class SwfAsset < ActiveRecord::Base 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] diff --git a/bundle b/bundle new file mode 100644 index 00000000..e69de29b diff --git a/config/environments/development.rb b/config/environments/development.rb index 4380159b..de1da145 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -11,7 +11,6 @@ OpenneoImpressItems::Application.configure do # 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 diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 51c703b7..a527513a 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -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, diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 00000000..cd6b9f82 --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -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 \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 32603238..86b3d813 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ -OpenneoImpressItems::Application.routes.draw do |map| +OpenneoImpressItems::Application.routes.draw do get "petpages/new" get "closet_lists/new" diff --git a/isntall b/isntall new file mode 100644 index 00000000..e69de29b diff --git a/vendor/cache/abstract-1.0.0.gem b/vendor/cache/abstract-1.0.0.gem deleted file mode 100644 index a9be232a..00000000 Binary files a/vendor/cache/abstract-1.0.0.gem and /dev/null differ diff --git a/vendor/cache/actionmailer-3.0.20.gem b/vendor/cache/actionmailer-3.0.20.gem deleted file mode 100644 index 80e43eb2..00000000 Binary files a/vendor/cache/actionmailer-3.0.20.gem and /dev/null differ diff --git a/vendor/cache/actionmailer-3.1.11.gem b/vendor/cache/actionmailer-3.1.11.gem new file mode 100644 index 00000000..50d44341 Binary files /dev/null and b/vendor/cache/actionmailer-3.1.11.gem differ diff --git a/vendor/cache/actionpack-3.0.20.gem b/vendor/cache/actionpack-3.0.20.gem deleted file mode 100644 index cf095cb5..00000000 Binary files a/vendor/cache/actionpack-3.0.20.gem and /dev/null differ diff --git a/vendor/cache/actionpack-3.1.11.gem b/vendor/cache/actionpack-3.1.11.gem new file mode 100644 index 00000000..f9acc170 Binary files /dev/null and b/vendor/cache/actionpack-3.1.11.gem differ diff --git a/vendor/cache/activemodel-3.0.20.gem b/vendor/cache/activemodel-3.0.20.gem deleted file mode 100644 index a0ff819c..00000000 Binary files a/vendor/cache/activemodel-3.0.20.gem and /dev/null differ diff --git a/vendor/cache/activemodel-3.1.11.gem b/vendor/cache/activemodel-3.1.11.gem new file mode 100644 index 00000000..6787201a Binary files /dev/null and b/vendor/cache/activemodel-3.1.11.gem differ diff --git a/vendor/cache/activerecord-3.0.20.gem b/vendor/cache/activerecord-3.0.20.gem deleted file mode 100644 index fe0d039e..00000000 Binary files a/vendor/cache/activerecord-3.0.20.gem and /dev/null differ diff --git a/vendor/cache/activerecord-3.1.11.gem b/vendor/cache/activerecord-3.1.11.gem new file mode 100644 index 00000000..5bdc8f1a Binary files /dev/null and b/vendor/cache/activerecord-3.1.11.gem differ diff --git a/vendor/cache/activeresource-3.0.20.gem b/vendor/cache/activeresource-3.0.20.gem deleted file mode 100644 index 6c4c6d76..00000000 Binary files a/vendor/cache/activeresource-3.0.20.gem and /dev/null differ diff --git a/vendor/cache/activeresource-3.1.11.gem b/vendor/cache/activeresource-3.1.11.gem new file mode 100644 index 00000000..6e60f841 Binary files /dev/null and b/vendor/cache/activeresource-3.1.11.gem differ diff --git a/vendor/cache/activesupport-3.0.20.gem b/vendor/cache/activesupport-3.0.20.gem deleted file mode 100644 index 9d3c2455..00000000 Binary files a/vendor/cache/activesupport-3.0.20.gem and /dev/null differ diff --git a/vendor/cache/activesupport-3.1.11.gem b/vendor/cache/activesupport-3.1.11.gem new file mode 100644 index 00000000..d0f0d9e5 Binary files /dev/null and b/vendor/cache/activesupport-3.1.11.gem differ diff --git a/vendor/cache/addressable-2.3.2.gem b/vendor/cache/addressable-2.3.2.gem deleted file mode 100644 index a17dfdc5..00000000 Binary files a/vendor/cache/addressable-2.3.2.gem and /dev/null differ diff --git a/vendor/cache/addressable-2.3.3.gem b/vendor/cache/addressable-2.3.3.gem new file mode 100644 index 00000000..17cee506 Binary files /dev/null and b/vendor/cache/addressable-2.3.3.gem differ diff --git a/vendor/cache/arel-2.0.10.gem b/vendor/cache/arel-2.0.10.gem deleted file mode 100644 index 0ed33b56..00000000 Binary files a/vendor/cache/arel-2.0.10.gem and /dev/null differ diff --git a/vendor/cache/arel-2.2.3.gem b/vendor/cache/arel-2.2.3.gem new file mode 100644 index 00000000..c2255f81 Binary files /dev/null and b/vendor/cache/arel-2.2.3.gem differ diff --git a/vendor/cache/builder-2.1.2.gem b/vendor/cache/builder-2.1.2.gem deleted file mode 100644 index c9016972..00000000 Binary files a/vendor/cache/builder-2.1.2.gem and /dev/null differ diff --git a/vendor/cache/builder-3.0.4.gem b/vendor/cache/builder-3.0.4.gem new file mode 100644 index 00000000..15c6ee23 Binary files /dev/null and b/vendor/cache/builder-3.0.4.gem differ diff --git a/vendor/cache/diff-lcs-1.1.3.gem b/vendor/cache/diff-lcs-1.1.3.gem deleted file mode 100644 index 8767f39d..00000000 Binary files a/vendor/cache/diff-lcs-1.1.3.gem and /dev/null differ diff --git a/vendor/cache/diff-lcs-1.2.1.gem b/vendor/cache/diff-lcs-1.2.1.gem new file mode 100644 index 00000000..019e4b20 Binary files /dev/null and b/vendor/cache/diff-lcs-1.2.1.gem differ diff --git a/vendor/cache/erubis-2.6.6.gem b/vendor/cache/erubis-2.6.6.gem deleted file mode 100644 index 17b23c42..00000000 Binary files a/vendor/cache/erubis-2.6.6.gem and /dev/null differ diff --git a/vendor/cache/erubis-2.7.0.gem b/vendor/cache/erubis-2.7.0.gem new file mode 100644 index 00000000..4acd2e76 Binary files /dev/null and b/vendor/cache/erubis-2.7.0.gem differ diff --git a/vendor/cache/excon-0.16.10.gem b/vendor/cache/excon-0.16.10.gem deleted file mode 100644 index a4570e6e..00000000 Binary files a/vendor/cache/excon-0.16.10.gem and /dev/null differ diff --git a/vendor/cache/excon-0.19.3.gem b/vendor/cache/excon-0.19.3.gem new file mode 100644 index 00000000..0dedab4a Binary files /dev/null and b/vendor/cache/excon-0.19.3.gem differ diff --git a/vendor/cache/hike-1.2.1.gem b/vendor/cache/hike-1.2.1.gem new file mode 100644 index 00000000..9bf7631d Binary files /dev/null and b/vendor/cache/hike-1.2.1.gem differ diff --git a/vendor/cache/i18n-0.5.0.gem b/vendor/cache/i18n-0.5.0.gem deleted file mode 100644 index 14b157db..00000000 Binary files a/vendor/cache/i18n-0.5.0.gem and /dev/null differ diff --git a/vendor/cache/i18n-0.6.4.gem b/vendor/cache/i18n-0.6.4.gem new file mode 100644 index 00000000..6eaf10f0 Binary files /dev/null and b/vendor/cache/i18n-0.6.4.gem differ diff --git a/vendor/cache/mail-2.2.19.gem b/vendor/cache/mail-2.2.19.gem deleted file mode 100644 index f1170c35..00000000 Binary files a/vendor/cache/mail-2.2.19.gem and /dev/null differ diff --git a/vendor/cache/mail-2.3.3.gem b/vendor/cache/mail-2.3.3.gem new file mode 100644 index 00000000..53035cc2 Binary files /dev/null and b/vendor/cache/mail-2.3.3.gem differ diff --git a/vendor/cache/mime-types-1.19.gem b/vendor/cache/mime-types-1.19.gem deleted file mode 100644 index f2009261..00000000 Binary files a/vendor/cache/mime-types-1.19.gem and /dev/null differ diff --git a/vendor/cache/mime-types-1.21.gem b/vendor/cache/mime-types-1.21.gem new file mode 100644 index 00000000..0bfdbe69 Binary files /dev/null and b/vendor/cache/mime-types-1.21.gem differ diff --git a/vendor/cache/mini_magick-3.4.gem b/vendor/cache/mini_magick-3.4.gem deleted file mode 100644 index 0c0e384f..00000000 Binary files a/vendor/cache/mini_magick-3.4.gem and /dev/null differ diff --git a/vendor/cache/mini_magick-3.5.0.gem b/vendor/cache/mini_magick-3.5.0.gem new file mode 100644 index 00000000..82cedb70 Binary files /dev/null and b/vendor/cache/mini_magick-3.5.0.gem differ diff --git a/vendor/cache/mysql2-0.2.18.gem b/vendor/cache/mysql2-0.2.18.gem deleted file mode 100644 index 0b82bb2f..00000000 Binary files a/vendor/cache/mysql2-0.2.18.gem and /dev/null differ diff --git a/vendor/cache/mysql2-0.3.11.gem b/vendor/cache/mysql2-0.3.11.gem new file mode 100644 index 00000000..32209db0 Binary files /dev/null and b/vendor/cache/mysql2-0.3.11.gem differ diff --git a/vendor/cache/net-ssh-2.6.3.gem b/vendor/cache/net-ssh-2.6.3.gem deleted file mode 100644 index f5038059..00000000 Binary files a/vendor/cache/net-ssh-2.6.3.gem and /dev/null differ diff --git a/vendor/cache/net-ssh-2.6.6.gem b/vendor/cache/net-ssh-2.6.6.gem new file mode 100644 index 00000000..4076367b Binary files /dev/null and b/vendor/cache/net-ssh-2.6.6.gem differ diff --git a/vendor/cache/newrelic_rpm-3.5.5.38.gem b/vendor/cache/newrelic_rpm-3.5.5.38.gem deleted file mode 100644 index 097491b4..00000000 Binary files a/vendor/cache/newrelic_rpm-3.5.5.38.gem and /dev/null differ diff --git a/vendor/cache/newrelic_rpm-3.5.8.70.gem b/vendor/cache/newrelic_rpm-3.5.8.70.gem new file mode 100644 index 00000000..06163059 Binary files /dev/null and b/vendor/cache/newrelic_rpm-3.5.8.70.gem differ diff --git a/vendor/cache/paper_trail-2.7.0.gem b/vendor/cache/paper_trail-2.7.0.gem deleted file mode 100644 index 7eb2cf0e..00000000 Binary files a/vendor/cache/paper_trail-2.7.0.gem and /dev/null differ diff --git a/vendor/cache/paper_trail-2.7.1.gem b/vendor/cache/paper_trail-2.7.1.gem new file mode 100644 index 00000000..5ca70efc Binary files /dev/null and b/vendor/cache/paper_trail-2.7.1.gem differ diff --git a/vendor/cache/rack-1.2.7.gem b/vendor/cache/rack-1.2.7.gem deleted file mode 100644 index 0c4b7c2b..00000000 Binary files a/vendor/cache/rack-1.2.7.gem and /dev/null differ diff --git a/vendor/cache/rack-1.3.10.gem b/vendor/cache/rack-1.3.10.gem new file mode 100644 index 00000000..850fc64e Binary files /dev/null and b/vendor/cache/rack-1.3.10.gem differ diff --git a/vendor/cache/rack-cache-1.2.gem b/vendor/cache/rack-cache-1.2.gem new file mode 100644 index 00000000..05bcc0dd Binary files /dev/null and b/vendor/cache/rack-cache-1.2.gem differ diff --git a/vendor/cache/rack-mount-0.6.14.gem b/vendor/cache/rack-mount-0.6.14.gem deleted file mode 100644 index 71e6fd35..00000000 Binary files a/vendor/cache/rack-mount-0.6.14.gem and /dev/null differ diff --git a/vendor/cache/rack-mount-0.8.3.gem b/vendor/cache/rack-mount-0.8.3.gem new file mode 100644 index 00000000..a88d4f2f Binary files /dev/null and b/vendor/cache/rack-mount-0.8.3.gem differ diff --git a/vendor/cache/rack-protection-1.4.0.gem b/vendor/cache/rack-protection-1.4.0.gem new file mode 100644 index 00000000..89ff729b Binary files /dev/null and b/vendor/cache/rack-protection-1.4.0.gem differ diff --git a/vendor/cache/rack-ssl-1.3.3.gem b/vendor/cache/rack-ssl-1.3.3.gem new file mode 100644 index 00000000..c5419ed0 Binary files /dev/null and b/vendor/cache/rack-ssl-1.3.3.gem differ diff --git a/vendor/cache/rack-test-0.5.7.gem b/vendor/cache/rack-test-0.5.7.gem deleted file mode 100644 index f7b9bc42..00000000 Binary files a/vendor/cache/rack-test-0.5.7.gem and /dev/null differ diff --git a/vendor/cache/rack-test-0.6.2.gem b/vendor/cache/rack-test-0.6.2.gem new file mode 100644 index 00000000..49343212 Binary files /dev/null and b/vendor/cache/rack-test-0.6.2.gem differ diff --git a/vendor/cache/rails-3.0.20.gem b/vendor/cache/rails-3.1.11.gem similarity index 50% rename from vendor/cache/rails-3.0.20.gem rename to vendor/cache/rails-3.1.11.gem index 4f6f9d99..5c0e9fb6 100644 Binary files a/vendor/cache/rails-3.0.20.gem and b/vendor/cache/rails-3.1.11.gem differ diff --git a/vendor/cache/railties-3.0.20.gem b/vendor/cache/railties-3.0.20.gem deleted file mode 100644 index 925f69da..00000000 Binary files a/vendor/cache/railties-3.0.20.gem and /dev/null differ diff --git a/vendor/cache/railties-3.1.11.gem b/vendor/cache/railties-3.1.11.gem new file mode 100644 index 00000000..b920c901 Binary files /dev/null and b/vendor/cache/railties-3.1.11.gem differ diff --git a/vendor/cache/rdoc-3.12.2.gem b/vendor/cache/rdoc-3.12.2.gem new file mode 100644 index 00000000..5e245253 Binary files /dev/null and b/vendor/cache/rdoc-3.12.2.gem differ diff --git a/vendor/cache/rdoc-3.12.gem b/vendor/cache/rdoc-3.12.gem deleted file mode 100644 index 0c214989..00000000 Binary files a/vendor/cache/rdoc-3.12.gem and /dev/null differ diff --git a/vendor/cache/redis-3.0.2.gem b/vendor/cache/redis-3.0.2.gem deleted file mode 100644 index 08f7fd63..00000000 Binary files a/vendor/cache/redis-3.0.2.gem and /dev/null differ diff --git a/vendor/cache/redis-3.0.3.gem b/vendor/cache/redis-3.0.3.gem new file mode 100644 index 00000000..588a654e Binary files /dev/null and b/vendor/cache/redis-3.0.3.gem differ diff --git a/vendor/cache/resque-scheduler-2.0.0.e.gem b/vendor/cache/resque-scheduler-2.0.0.e.gem deleted file mode 100644 index 7e49d9a9..00000000 Binary files a/vendor/cache/resque-scheduler-2.0.0.e.gem and /dev/null differ diff --git a/vendor/cache/resque-scheduler-2.0.0.gem b/vendor/cache/resque-scheduler-2.0.0.gem new file mode 100644 index 00000000..1b438807 Binary files /dev/null and b/vendor/cache/resque-scheduler-2.0.0.gem differ diff --git a/vendor/cache/sinatra-1.2.8.gem b/vendor/cache/sinatra-1.2.8.gem deleted file mode 100644 index 7b1906d8..00000000 Binary files a/vendor/cache/sinatra-1.2.8.gem and /dev/null differ diff --git a/vendor/cache/sinatra-1.3.3.gem b/vendor/cache/sinatra-1.3.3.gem new file mode 100644 index 00000000..7d30e967 Binary files /dev/null and b/vendor/cache/sinatra-1.3.3.gem differ diff --git a/vendor/cache/sprockets-2.0.4.gem b/vendor/cache/sprockets-2.0.4.gem new file mode 100644 index 00000000..d3a0c221 Binary files /dev/null and b/vendor/cache/sprockets-2.0.4.gem differ diff --git a/vendor/cache/tilt-1.3.3.gem b/vendor/cache/tilt-1.3.3.gem deleted file mode 100644 index 27549643..00000000 Binary files a/vendor/cache/tilt-1.3.3.gem and /dev/null differ diff --git a/vendor/cache/tilt-1.3.4.gem b/vendor/cache/tilt-1.3.4.gem new file mode 100644 index 00000000..bc97d061 Binary files /dev/null and b/vendor/cache/tilt-1.3.4.gem differ diff --git a/vendor/cache/tzinfo-0.3.35.gem b/vendor/cache/tzinfo-0.3.35.gem deleted file mode 100644 index 048897ee..00000000 Binary files a/vendor/cache/tzinfo-0.3.35.gem and /dev/null differ diff --git a/vendor/cache/tzinfo-0.3.36.gem b/vendor/cache/tzinfo-0.3.36.gem new file mode 100644 index 00000000..8c60a9d1 Binary files /dev/null and b/vendor/cache/tzinfo-0.3.36.gem differ diff --git a/vendor/cache/yard-0.8.3.gem b/vendor/cache/yard-0.8.3.gem deleted file mode 100644 index b1572548..00000000 Binary files a/vendor/cache/yard-0.8.3.gem and /dev/null differ diff --git a/vendor/cache/yard-0.8.5.2.gem b/vendor/cache/yard-0.8.5.2.gem new file mode 100644 index 00000000..f5d7160b Binary files /dev/null and b/vendor/cache/yard-0.8.5.2.gem differ