diff --git a/Gemfile b/Gemfile index 8f8d8f9a..d78bc773 100644 --- a/Gemfile +++ b/Gemfile @@ -19,8 +19,6 @@ gem 'RocketAMF', :git => 'https://github.com/rubyamf/rocketamf.git' gem 'msgpack', '~> 0.5.3' gem 'openneo-auth-signatory', '~> 0.1.0' -gem 'right_aws', '~> 2.1.0' - gem "character-encodings", "~> 0.4.1", :platforms => :ruby_18 gem "nokogiri", "~> 1.5.2" diff --git a/Gemfile.lock b/Gemfile.lock index 0f639350..4cc46c4f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -175,9 +175,6 @@ GEM railties (>= 3.2, < 4.2) rest-client (1.6.9) mime-types (~> 1.16) - right_aws (2.1.0) - right_http_connection (>= 1.2.5) - right_http_connection (1.5.0) rspec (2.0.1) rspec-core (~> 2.0.1) rspec-expectations (~> 2.0.1) @@ -251,7 +248,6 @@ DEPENDENCIES rdiscount (~> 1.6.5) react-rails (~> 2.7, >= 2.7.1) rest-client (~> 1.6.7) - right_aws (~> 2.1.0) rspec-rails (~> 2.0.0.beta.22) rvm-capistrano (~> 1.5.6) sanitize (~> 2.0.3) diff --git a/app/models/swf_asset.rb b/app/models/swf_asset.rb index 08ff109e..76d47669 100644 --- a/app/models/swf_asset.rb +++ b/app/models/swf_asset.rb @@ -8,12 +8,6 @@ class SwfAsset < ActiveRecord::Base PUBLIC_ASSET_DIR = File.join('swfs', 'outfit') LOCAL_ASSET_DIR = Rails.root.join('public', PUBLIC_ASSET_DIR) - IMAGE_BUCKET = IMPRESS_S3.bucket('impress-asset-images') - IMAGE_PERMISSION = 'public-read' - IMAGE_HEADERS = { - 'Cache-Control' => 'max-age=315360000', - 'Content-Type' => 'image/png' - } # This is the URL origin we should use when loading from images.neopets.com. # It can be overridden in .env as `NEOPETS_IMAGES_URL_ORIGIN`, to use our # asset proxy instead. diff --git a/config/initializers/aws_s3.rb b/config/initializers/aws_s3.rb deleted file mode 100644 index 2281a1eb..00000000 --- a/config/initializers/aws_s3.rb +++ /dev/null @@ -1,13 +0,0 @@ -access_key_id = ENV.fetch('AWS_ACCESS_KEY_ID') -secret_access_key = ENV.fetch('AWS_SECRET_ACCESS_KEY') - -def set(params, params_key, env_key) - params[params_key] = ENV[env_key] if ENV.has_key?(env_key) -end - -params = {} -set params, :server, 'AWS_SERVER_HOST' -set params, :port, 'AWS_SERVER_PORT' -set params, :protocol, 'AWS_SERVER_PROTOCOL' - -IMPRESS_S3 = RightAws::S3.new access_key_id, secret_access_key, params diff --git a/vendor/cache/right_aws-2.1.0.gem b/vendor/cache/right_aws-2.1.0.gem deleted file mode 100644 index e7ec0f56..00000000 Binary files a/vendor/cache/right_aws-2.1.0.gem and /dev/null differ diff --git a/vendor/cache/right_http_connection-1.5.0.gem b/vendor/cache/right_http_connection-1.5.0.gem deleted file mode 100644 index 17420e2f..00000000 Binary files a/vendor/cache/right_http_connection-1.5.0.gem and /dev/null differ