dice/impress
1
0
Fork 0
forked from OpenNeo/impress
Code Pull requests Activity

ruby 2.0.0 compatibility... hopefully.

Browse source
This commit is contained in:
Emi Matchu 2013-02-25 01:14:45 -05:00
parent 0074e54417
commit f547a75c40
13 changed files with 49 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -15,10 +15,10 @@ gem 'devise', '~> 1.1.5'
# unstable version of RocketAMF interprets info registry as a hash instead of an array
gem 'RocketAMF', :git => 'git://github.com/rubyamf/rocketamf.git'
gem 'msgpack', '~> 0.4.3'
gem 'msgpack', '~> 0.5.3'
gem 'openneo-auth-signatory', '~> 0.1.0'
gem 'jammit', '~> 0.5.3'
gem 'jammit', '~> 0.6.5'
gem 'hoptoad_notifier'

12
Gemfile.lock
View file

@ -116,7 +116,6 @@ GEM
activesupport (~> 3.0)
character-encodings (0.4.1)
chronic (0.6.7)
closure-compiler (1.1.8)
compass (0.10.6)
haml (>= 3.0.4)
cookiejar (0.3.0)
@ -152,9 +151,8 @@ GEM
builder
http_parser.rb (0.5.3)
i18n (0.5.0)
jammit (0.5.4)
closure-compiler (>= 0.1.0)
yui-compressor (>= 0.9.1)
jammit (0.6.5)
yui-compressor (>= 0.9.3)
json (1.7.7)
mail (2.2.19)
activesupport (>= 2.3.6)
@ -165,7 +163,7 @@ GEM
mime-types (1.19)
mini_magick (3.4)
subexec (~> 0.2.1)
msgpack (0.4.7)
msgpack (0.5.3)
multi_json (1.3.7)
mysql2 (0.2.18)
net-scp (1.0.4)
@ -295,11 +293,11 @@ DEPENDENCIES
haml (~> 3.0.18)
hoptoad_notifier
http_accept_language!
jammit (~> 0.5.3)
jammit (~> 0.6.5)
json (~> 1.7.7)
memcache-client (~> 1.8.5)
mini_magick (~> 3.4)
msgpack (~> 0.4.3)
msgpack (~> 0.5.3)
mysql2 (< 0.3)
mysqlplus!
neopets (~> 0.2.0)!

1
app/controllers/pets_controller.rb
View file

@ -56,6 +56,7 @@ class PetsController < ApplicationController
def pet_download_error(e)
Rails.logger.warn e.message
Rails.logger.warn e.backtrace.join("\n")
pet_load_error :long_message => t('pets.load.pet_download_error'),
:status => :gateway_timeout
end

2
app/models/pet.rb
View file

@ -58,7 +58,7 @@ class Pet < ActiveRecord::Base
end
raise DownloadError, e.message
rescue RocketAMF::RemoteGateway::ConnectionError => e
raise DownloadError, e.message
raise DownloadError, e.message, e.backtrace
end
OpenStruct.new(envelope.messages[0].data.body)
end

2
config/application.rb
View file

@ -42,6 +42,8 @@ module OpenneoImpressItems
config.filter_parameters << :password
Mime::Type.register "image/gif", :gif
ActionController::Base.config.relative_url_root = ''
end
end

4
lib/rocketamf/remote_gateway/request.rb
View file

@ -14,7 +14,7 @@ module RocketAMF
uri = @action.service.gateway.uri
data = envelope.serialize
req = Net::HTTP::Post.new(uri.path)
req = Net::HTTP::Post.new(uri.request_uri)
req.body = data
headers = options[:headers] || {}
headers.each do |key, value|
@ -46,7 +46,7 @@ module RocketAMF
begin
result = RocketAMF::Envelope.new.populate_from_stream(response_body)
rescue Exception => e
raise ConnectionError, e.message
raise ConnectionError, e.message, e.backtrace
end
first_message_data = result.messages[0].data

28
public/stylesheets/compiled/print.css
View file

@ -1,4 +1,4 @@
/* line 29, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 29, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
body {
line-height: 1.5;
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
@ -7,12 +7,12 @@ body {
font-size: 10pt;
}
/* line 52, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 52, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
.container {
background: none;
}
/* line 54, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 54, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
hr {
background: #cccccc;
color: #cccccc;
@ -22,40 +22,40 @@ hr {
padding: 0;
border: none;
}
/* line 62, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 62, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
hr.space {
background: white;
color: white;
}
/* line 65, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 65, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
h1, h2, h3, h4, h5, h6 {
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
}
/* line 67, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 67, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
code {
font-size: 0.9em;
font-family: "andale mono", "lucida console", monospace;
}
/* line 72, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 72, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
a img {
border: none;
}
/* line 75, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 75, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
a:link, a:visited {
background: transparent;
font-weight: 700;
text-decoration: underline;
}
/* line 79, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 79, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
p img.top {
margin-top: 0;
}
/* line 81, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 81, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
blockquote {
margin: 1.5em;
padding: 1em;
@ -63,22 +63,22 @@ blockquote {
font-size: 0.9em;
}
/* line 86, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 86, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
.small {
font-size: 0.9em;
}
/* line 88, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 88, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
.large {
font-size: 1.1em;
}
/* line 90, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 90, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
.quiet {
color: #999999;
}
/* line 92, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
/* line 92, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */
.hide {
display: none;
}

44
public/stylesheets/compiled/screen.css
View file

@ -651,7 +651,7 @@ body.closet_hangers-index #closet-hangers-contact a, body.closet_hangers-index #
height: 100%;
padding-left: 20px;
}
/* line 4, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/utilities/links/_hover-link.scss */
/* line 4, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/utilities/links/_hover-link.scss */
body.closet_hangers-index #closet-hangers-contact a:hover, body.closet_hangers-index #closet-hangers-contact > span:hover {
text-decoration: underline;
}
@ -1338,7 +1338,7 @@ body.closet_hangers-petpage #petpage-closet-lists h4 {
*vertical-align: auto;
vertical-align: middle;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.closet_hangers-petpage #petpage-closet-lists h4 {
*display: inline;
}
@ -1363,7 +1363,7 @@ body.closet_hangers-petpage #petpage-closet-lists ul li {
margin: 0.25em 0.5em;
padding: 1px;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.closet_hangers-petpage #petpage-closet-lists ul li {
*display: inline;
}
@ -1775,7 +1775,7 @@ body.items-show #item-header div, body.items-show #item-header img {
vertical-align: middle;
*vertical-align: auto;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.items-show #item-header div, body.items-show #item-header img {
*display: inline;
}
@ -1829,7 +1829,7 @@ body.items-show #item-preview-species a {
vertical-align: middle;
*vertical-align: auto;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.items-show #item-preview-species a {
*display: inline;
}
@ -1951,17 +1951,17 @@ body.items-show #item-contributors footer {
body.items-show #item-contributors ul {
list-style-type: none;
}
/* line 5, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/utilities/lists/_inline-list.scss */
/* line 5, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/utilities/lists/_inline-list.scss */
body.items-show #item-contributors ul, body.items-show #item-contributors ul li {
margin: 0px;
padding: 0px;
display: inline;
}
/* line 24, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/utilities/lists/_inline-list.scss */
/* line 24, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/utilities/lists/_inline-list.scss */
body.items-show #item-contributors ul li:after {
content: ", ";
}
/* line 26, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/utilities/lists/_inline-list.scss */
/* line 26, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/utilities/lists/_inline-list.scss */
body.items-show #item-contributors ul li:last-child:after, body.items-show #item-contributors ul li.last:after {
content: "";
}
@ -1981,7 +1981,7 @@ body.items-show #item-preview-header h3, body.items-show #item-preview-header a
vertical-align: middle;
*vertical-align: auto;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.items-show #item-preview-header h3, body.items-show #item-preview-header a {
*display: inline;
}
@ -2077,7 +2077,7 @@ body.outfits-edit #preview-toolbar form {
*vertical-align: auto;
margin-right: 2em;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.outfits-edit #preview-toolbar form {
*display: inline;
}
@ -2400,7 +2400,7 @@ body.outfits-edit #preview-search-form h2 {
*vertical-align: auto;
margin: 0 1em 0 0;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.outfits-edit #preview-search-form h2 {
*display: inline;
}
@ -2412,7 +2412,7 @@ body.outfits-edit #preview-search-form input {
vertical-align: middle;
*vertical-align: auto;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.outfits-edit #preview-search-form input {
*display: inline;
}
@ -2434,7 +2434,7 @@ body.outfits-edit #preview-search-form-pagination {
vertical-align: middle;
*vertical-align: auto;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.outfits-edit #preview-search-form-pagination {
*display: inline;
}
@ -2531,7 +2531,7 @@ body.outfits-edit.fullscreen #preview-search-form-help div {
*vertical-align: auto;
width: 48%;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.outfits-edit.fullscreen #preview-search-form-help div {
*display: inline;
}
@ -2727,7 +2727,7 @@ body.outfits-edit #preview-outfits > ul > li {
position: relative;
font-size: 14px;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.outfits-edit #preview-outfits > ul > li {
*display: inline;
}
@ -3060,7 +3060,7 @@ body.outfits-edit #preview-sharing #preview-sharing-url-formats li {
font-size: 12px;
padding: 0 2em;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.outfits-edit #preview-sharing #preview-sharing-url-formats li {
*display: inline;
}
@ -3350,7 +3350,7 @@ body.outfits-edit form#save-outfit-form .outfit-star, body.outfits-edit form#sav
float: none;
vertical-align: top;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.outfits-edit form#save-outfit-form .outfit-star, body.outfits-edit form#save-outfit-form input, body.outfits-edit form#save-outfit-form button {
*display: inline;
}
@ -3401,7 +3401,7 @@ body.outfits-edit.user-signed-in .preview-search-form-your-items {
vertical-align: middle;
*vertical-align: auto;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.outfits-edit.user-signed-in .preview-search-form-your-items {
*display: inline;
}
@ -3442,7 +3442,7 @@ body.outfits-index #outfits > li {
position: relative;
font-size: 14px;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.outfits-index #outfits > li {
*display: inline;
}
@ -4077,7 +4077,7 @@ body.pets-bulk #needed-items-form #needed-items-pet #needed-items-reload {
margin-left: 1em;
vertical-align: middle;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.pets-bulk #needed-items-form #needed-items-pet #needed-items-reload {
*display: inline;
}
@ -4151,7 +4151,7 @@ body.pets-bulk #bulk-pets-form textarea {
overflow: hidden;
resize: none;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.pets-bulk #bulk-pets-form textarea {
*display: inline;
}
@ -4172,7 +4172,7 @@ body.pets-bulk #bulk-pets-form ul li {
min-width: 25%;
text-align: left;
}
/* line 7, ../../../../../../.rvm/gems/ruby-1.9.3-p385/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
/* line 7, ../../../../../../.rvm/gems/ruby-2.0.0-p0/gems/compass-0.10.6/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
body.pets-bulk #bulk-pets-form ul li {
*display: inline;
}

BIN
vendor/cache/closure-compiler-1.1.8.gem vendored
View file

Binary file not shown.

BIN
vendor/cache/jammit-0.5.4.gem vendored
View file

Binary file not shown.

BIN
vendor/cache/jammit-0.6.5.gem vendored Normal file
View file

Binary file not shown.

BIN
vendor/cache/msgpack-0.4.7.gem vendored
View file

Binary file not shown.

BIN
vendor/cache/msgpack-0.5.3.gem vendored Normal file
View file

Binary file not shown.