Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecesary aws-sdk gems #221

Merged
merged 2 commits into from
Aug 3, 2019
Merged

Remove unnecesary aws-sdk gems #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2fe847
feat(storage): update paperclip and remove unnecesary initializer
rjherrera Aug 3, 2019
f89f635
feat(storage): use aws-sdk-s3 gem instead of aws-sdk
rjherrera Aug 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/potassium/assets/aws.rb
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions lib/potassium/recipes/aws_sdk.rb
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion lib/potassium/recipes/file_storage.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def config_rspec_for_paperclip
end

def add_paperclip
gather_gem 'paperclip', '~> 5.0'
gather_gem 'paperclip', '~> 6.0'
application paperclip_config, env: 'production'
append_to_file '.gitignore', "/public/system/*\n"
end
Expand All @@ -63,6 +63,7 @@ def add_active_storage
end

def common_setup
gather_gem 'aws-sdk-s3', '~> 1.0'
add_readme_section :internal_dependencies, get(:storage)
append_to_file '.env.development', "S3_BUCKET=\n"
end
Expand Down
1 change: 0 additions & 1 deletion lib/potassium/templates/application.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
create :ruby
create :yarn
create :editorconfig
create :aws_sdk
create :mailer
create :background_processor
create :schedule
Expand Down
10 changes: 10 additions & 0 deletions spec/features/file_storage_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
create_dummy_project(storage: :active_storage)
end

it "adds the aws-sdk-s3 gem to Gemfile" do
gemfile_content = IO.read("#{project_path}/Gemfile")
expect(gemfile_content).to include("gem 'aws-sdk-s3'")
end

it "customizes config file" do
content = IO.read("#{project_path}/config/storage.yml")
expect(content).to include("bucket: <%= ENV['S3_BUCKET'] %>")
Expand Down Expand Up @@ -41,6 +46,11 @@
expect(gemfile_content).to include("gem 'paperclip'")
end

it "adds the aws-sdk-s3 gem to Gemfile" do
gemfile_content = IO.read("#{project_path}/Gemfile")
expect(gemfile_content).to include("gem 'aws-sdk-s3'")
end

it "adds brief to README file" do
content = IO.read("#{project_path}/README.md")
expect(content).to include("Paperclip")
Expand Down
8 changes: 0 additions & 8 deletions spec/features/new_project_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@
expect(gemfile).to include %{gem 'pg'}
end

it "configures aws" do
gemfile_content = IO.read("#{project_path}/Gemfile")
expect(gemfile_content).to include("'aws-sdk', '~> 3'")

initializer = IO.read("#{project_path}/config/initializers/aws.rb")
expect(initializer).to include("Aws::VERSION")
end

it "configures the correct ruby version" do
ruby_version_file = IO.read("#{project_path}/.ruby-version")

Expand Down