From 4e919aca04e5e36b53af4ffef37904f3863b54b8 Mon Sep 17 00:00:00 2001 From: Matchu Date: Tue, 31 May 2011 10:36:32 -0400 Subject: [PATCH] ree compatibility --- app/models/item.rb | 14 +++++++------- app/models/pet.rb | 3 ++- lib/rocketamf/remote_gateway.rb | 9 +++++---- public/stylesheets/compiled/print.css | 28 +++++++++++++-------------- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/app/models/item.rb b/app/models/item.rb index 5242eff3..2d4e4f37 100644 --- a/app/models/item.rb +++ b/app/models/item.rb @@ -701,16 +701,16 @@ class Item < ActiveRecord::Base # the zone requirement. If that max was NULL, return the object. item_ids = select(arel_table[:id]).joins( "LEFT JOIN #{ParentSwfAssetRelationship.table_name} #{psa.name} ON " + - psa[:swf_asset_type].eq(SwfAssetType) - .and(psa[:parent_id].eq(arel_table[:id])) - .to_sql + psa[:swf_asset_type].eq(SwfAssetType). + and(psa[:parent_id].eq(arel_table[:id])). + to_sql ). joins( "LEFT JOIN #{SwfAsset.table_name} #{sa.name} ON " + - sa[:type].eq(SwfAssetType) - .and(sa[:id].eq(psa[:swf_asset_id])) - .and(sa[:zone_id].in(zone_set.map(&:id))) - .to_sql + sa[:type].eq(SwfAssetType). + and(sa[:id].eq(psa[:swf_asset_id])). + and(sa[:zone_id].in(zone_set.map(&:id))). + to_sql ). group("#{table_name}.id"). having("MAX(#{sa.name}.id) IS NULL"). # SwfAsset.arel_table[:id].maximum has no #eq diff --git a/app/models/pet.rb b/app/models/pet.rb index 709971d8..35454d1e 100644 --- a/app/models/pet.rb +++ b/app/models/pet.rb @@ -1,3 +1,5 @@ +require 'rocketamf/remote_gateway' + class Pet < ActiveRecord::Base GATEWAY_URL = 'http://www.neopets.com/amfphp/gateway.php' AMF_SERVICE_NAME = 'CustomPetService' @@ -86,7 +88,6 @@ class Pet < ActiveRecord::Base def self.gateway unless @gateway - require 'rocketamf/remote_gateway' @gateway = RocketAMF::RemoteGateway.new(GATEWAY_URL) end @gateway diff --git a/lib/rocketamf/remote_gateway.rb b/lib/rocketamf/remote_gateway.rb index 818a9cda..5007093b 100644 --- a/lib/rocketamf/remote_gateway.rb +++ b/lib/rocketamf/remote_gateway.rb @@ -1,18 +1,19 @@ require 'net/http' require 'rocketamf' -require_relative 'remote_gateway/service' -require_relative 'remote_gateway/request' +require File.join(File.dirname(__FILE__), 'remote_gateway', 'service') +require File.join(File.dirname(__FILE__), 'remote_gateway', 'request') module RocketAMF class RemoteGateway attr_reader :uri - + def initialize(url) @uri = URI.parse url end - + def service(name) Service.new(self, name) end end end + diff --git a/public/stylesheets/compiled/print.css b/public/stylesheets/compiled/print.css index 63ac207b..1cb00909 100644 --- a/public/stylesheets/compiled/print.css +++ b/public/stylesheets/compiled/print.css @@ -1,4 +1,4 @@ -/* line 29, ../../../../../.rvm/gems/ruby-1.9.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 29, ../../../../../.rvm/gems/ree-1.8.7-2010.02/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.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 52, ../../../../../.rvm/gems/ree-1.8.7-2010.02/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ .container { background: none; } -/* line 54, ../../../../../.rvm/gems/ruby-1.9.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 54, ../../../../../.rvm/gems/ree-1.8.7-2010.02/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.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 62, ../../../../../.rvm/gems/ree-1.8.7-2010.02/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ hr.space { background: white; color: white; } -/* line 65, ../../../../../.rvm/gems/ruby-1.9.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 65, ../../../../../.rvm/gems/ree-1.8.7-2010.02/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.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 67, ../../../../../.rvm/gems/ree-1.8.7-2010.02/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.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 72, ../../../../../.rvm/gems/ree-1.8.7-2010.02/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ a img { border: none; } -/* line 75, ../../../../../.rvm/gems/ruby-1.9.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 75, ../../../../../.rvm/gems/ree-1.8.7-2010.02/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.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 79, ../../../../../.rvm/gems/ree-1.8.7-2010.02/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ p img.top { margin-top: 0; } -/* line 81, ../../../../../.rvm/gems/ruby-1.9.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 81, ../../../../../.rvm/gems/ree-1.8.7-2010.02/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.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 86, ../../../../../.rvm/gems/ree-1.8.7-2010.02/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ .small { font-size: 0.9em; } -/* line 88, ../../../../../.rvm/gems/ruby-1.9.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 88, ../../../../../.rvm/gems/ree-1.8.7-2010.02/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ .large { font-size: 1.1em; } -/* line 90, ../../../../../.rvm/gems/ruby-1.9.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 90, ../../../../../.rvm/gems/ree-1.8.7-2010.02/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ .quiet { color: #999999; } -/* line 92, ../../../../../.rvm/gems/ruby-1.9.2-preview3@rails3/gems/compass-0.10.5/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +/* line 92, ../../../../../.rvm/gems/ree-1.8.7-2010.02/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ .hide { display: none; }