potassium 5.1.4 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8e3229a27d5e3432c237879deb06753f6d6eba7f
-  data.tar.gz: 8b2ee90efb39056ecbdafd7f3e5acfbce40502a9
+SHA256:
+  metadata.gz: 586c6642ed62cba7a9a9aadba36fc53ea14f3dda6bd182c1e4e66e5818a4c19f
+  data.tar.gz: 8d12fa2fbf200d8664945c8187c4d257e3a5b5285057032a95eacb03ad088be4
 SHA512:
-  metadata.gz: 420d0c10911f3c4fa6da1be9e67e9bfb894a6a16431a1fc482b9781bc943013cea3a319dac589e3721af45c770a50edb6196205b96e7555fc3158f09cd1c49d1
-  data.tar.gz: d4759c06b04f116e0ff83df017df9c3f03426597e50127049658a50d851bb4bacea7c46b4c7e6c1dec15f5ce7655e8e4ca8eb2fcd64887e1639e11615dbd8016
+  metadata.gz: 60726b985ce4c24e7be3f92ecb9f8f9532b171b995768eef00e3afc8aa4ab6480d7f39a48efcb4a2b4da0d48154caa2f66a5f4eea5cf9269569c5955a7155fa3
+  data.tar.gz: 8bb3ee2bac542101adc27bc41a5ea6823cbb6a94a0a76bbcff731a3139c8d050f6b7d3d8ca8ba7b1715bb64b269999c0e393d5d712e278f745ccbbadfad24479

data/.ruby-version

@@ -1 +1 @@
-2.4
+2.5

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## Unreleased
 
+## 5.2.0
+
+Features:
+  - Add Active Storage recipe
+
+Changes:
+  - Update AWS to 3
+  - Update Rails to 5.2.1
+  - Update `ActiveAdmin` to 1.3.0
+  - Update ruby to 2.5
+  - Update to circleci 2
+
+Fix:
+  - Update `draper` to 3.0.1
+  - `FactoryGirl` update to `FactoryBot`
+  - `pg` gem has now explicit version: `~> 0.21`
+
 ## 5.1.4
 
 Changes:

data/README.md

@@ -42,7 +42,7 @@ Potassium Rails apps includes the following gems and technologies:
 - [EditorConfig](http://editorconfig.org) for keeping all our editor configurations the same.
 - [pry](http://pryrepl.org) and [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) for a less painful debugging experience.
 - [RSpec](http://rspec.info) for unit and integration testing.
-- [FactoryGirl](https://github.com/thoughtbot/factory_girl) for test factories.
+- [FactoryBot](https://github.com/thoughtbot/factory_bot] for test factories.
 - [Guard](http://guardgem.org) for continuous testing and other watch-related tasks.
 - [AWS-SDK](https://github.com/aws/aws-sdk-ruby) for file uploads, sdks, etc and because we use AWS.
 - [Puma](https://github.com/puma/puma) to serve HTTP requests

data/circle.yml

@@ -1,6 +1,6 @@
 machine:
   ruby:
-    version: 2.4.1
+    version: 2.5.1
   services:
     - docker
   post:

data/lib/potassium/assets/.circleci/config.yml

@@ -0,0 +1,20 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/app
+
+    docker:
+    - image: platanus/compose:1.22.0
+
+    steps:
+    - checkout
+    - setup_remote_docker
+
+    - run: docker info
+    - run: docker-compose -f docker-compose.ci.yml pull
+    - run: docker-compose -f docker-compose.ci.yml build test
+    - run: bin/cibuild services
+    - run: bin/cibuild deps
+
+    - run: bin/cibuild db
+    - run: bin/cibuild tests

data/lib/potassium/assets/Dockerfile.ci

@@ -1,4 +1,4 @@
-FROM platanus/ruby:2.4
+FROM platanus/ruby:2.5
 
 RUN mkdir /app
 WORKDIR /app

data/lib/potassium/assets/README.yml

@@ -86,6 +86,9 @@ readme:
         paperclip:
           title: "Uploads"
           body: "For managing uploads, this project uses [Paperclip](https://github.com/thoughtbot/paperclip), a gem made by the awesome [Thoughbot](https://thoughtbot.com/) team."
+        storage:
+          title: "Active Storage"
+          body: "For managing uploads, this project uses [Active Storage](https://github.com/rails/rails/tree/master/activestorage)."
         pundit:
           title: "Authorization"
           body: "For defining which parts of the system each user has access to, we have chosen to include the [Pundit](https://github.com/elabs/pundit) gem, by [Elabs](http://elabs.se/)."

data/lib/potassium/assets/aws.rb

@@ -0,0 +1 @@
+Aws::VERSION = Gem.loaded_specs["aws-sdk"].version

data/lib/potassium/assets/config/mailer.rb.erb

@@ -16,3 +16,13 @@ if ENV["EMAIL_RECIPIENTS"].present?
     subject_prefix: "[<%= get(:heroku) ? '#{Heroku.stage.upcase}' : '#{Rails.env}' %>]"
   )
 end
+<% if get(:mailer_delivery_method) == :aws_sdk -%>
+creds = Aws::Credentials.new(
+  ENV['AWS_ACCESS_KEY_ID'],
+  ENV['AWS_SECRET_ACCESS_KEY']
+)
+
+Aws::Rails.add_action_mailer_delivery_method(
+  :aws_sdk, credentials: creds, region: ENV.fetch('AWS_REGION', 'us-east-1')
+)
+<% end -%>

data/lib/potassium/assets/config/storage.yml

@@ -0,0 +1,12 @@
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+amazon:
+  service: S3
+  region: <%= ENV['AWS_REGION'] %>
+  bucket: <%= ENV['S3_BUCKET'] %>

data/lib/potassium/assets/docker-compose.ci.yml

@@ -1,9 +1,11 @@
-test:
-  build: .
-  dockerfile: Dockerfile.ci
-  working_dir: '/app'
-  volumes:
-    - ./vendor/bundle:/usr/local/bundle
-    - $CIRCLE_TEST_REPORTS/rspec:$HOME/.rspec_reports
-  environment:
-    RACK_ENV: test
+version: '3.4'
+
+services:
+  test:
+    build:
+      context: "."
+      dockerfile: Dockerfile.ci
+    volumes:
+    - "./vendor/bundle:/usr/local/bundle"
+    environment:
+      RACK_ENV: test

data/lib/potassium/assets/seeds/admin_data_loader.rb

@@ -1,11 +1,11 @@
 # Put, inside the load method, the necessary code to generate data with DEVELOPMENT PURPOSES.
-# Whenever you can, use FactoryGirl's methods to keep this code "self updated".
+# Whenever you can, use FactoryBot's methods to keep this code "self updated".
 #
 # For Example:
 #
 # Having a country factory in /spec/factories/countries.rb
 #
-# FactoryGirl.define do
+# FactoryBot.define do
 #   factory :country do
 #     name "Chile"
 #     locale "es-CL"
@@ -25,7 +25,7 @@
 Faker::Config.locale = I18n.locale
 
 module FakeDataLoader
-  extend FactoryGirl::Syntax::Methods
+  extend FactoryBot::Syntax::Methods
 
   def self.load
     load_admin

data/lib/potassium/assets/seeds/fake_data_loader.rb

@@ -1,11 +1,11 @@
 # Put, inside the load method, the necessary code to generate data with DEVELOPMENT PURPOSES.
-# Whenever you can, use FactoryGirl's methods to keep this code "self updated".
+# Whenever you can, use FactoryBot's methods to keep this code "self updated".
 #
 # For Example:
 #
 # Having a country factory in /spec/factories/countries.rb
 #
-# FactoryGirl.define do
+# FactoryBot.define do
 #   factory :country do
 #     name "Chile"
 #     locale "es-CL"
@@ -25,7 +25,7 @@
 Faker::Config.locale = I18n.locale
 
 module FakeDataLoader
-  extend FactoryGirl::Syntax::Methods
+  extend FactoryBot::Syntax::Methods
 
   def self.load
     # Put here the code to generate data with DEVELOPMENT PURPOSES.

data/lib/potassium/assets/testing/paperclip.rb

@@ -46,7 +46,7 @@ end
 #
 # From your factories:
 #
-# FactoryGirl.define do
+# FactoryBot.define do
 #   factory :ticket do
 #     attachment { fixture_asset("platanus.png", "image/png") }
 #   end

data/lib/potassium/assets/testing/rails_helper.rb

@@ -47,7 +47,7 @@ RSpec.configure do |config|
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
 
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 end
 
 Shoulda::Matchers.configure do |config|

data/lib/potassium/cli_options.rb

@@ -74,6 +74,14 @@ module Potassium::CliOptions # rubocop:disable Metrics/ModuleLength
       default_value: "none",
       default_test_value: false
     },
+    {
+      type: :switch,
+      name: "active_storage",
+      desc: "Whether to include Active Storage as dependency",
+      negatable: true,
+      default_value: "none",
+      default_test_value: false
+    },
     {
       type: :switch,
       name: "heroku",

data/lib/potassium/helpers/docker-helpers.rb

@@ -5,7 +5,7 @@ class DockerHelpers
   end
 
   def add_link(target_service, linked_service)
-    service = @compose[target_service]
+    service = @compose['services'][target_service]
     unless service['links'].is_a? Array
       service['links'] = []
     end
@@ -14,7 +14,7 @@ class DockerHelpers
   end
 
   def add_env(target_service, variable_key, variable_value)
-    service = @compose[target_service]
+    service = @compose['services'][target_service]
     unless service['environment'].is_a? Hash
       service['environment'] = {}
     end
@@ -25,7 +25,7 @@ class DockerHelpers
   def add_service(name, definition)
     service = {}
     service[name] = YAML.load(definition)
-    @compose.merge!(service)
+    @compose['services'].merge!(service)
     save
   end
 

data/lib/potassium/helpers/readme-helpers.rb

@@ -4,11 +4,11 @@ module ReadmeHelpers
     add_readme_header(header, iterpolation_values)
 
     insert_into_readme(section_data[:header_title]) do
-      <<-HERE.gsub(/^ {6}/, '')
+      <<~HERE
 
-      ### #{section_data[:title]}
+        ### #{section_data[:title]}
 
-      #{section_data[:body]}
+        #{section_data[:body]}
       HERE
     end
   end
@@ -19,18 +19,18 @@ module ReadmeHelpers
 
     if header_data[:body]
       insert_into_readme do
-        <<-HERE.gsub(/^ {8}/, '')
+        <<~HERE
 
-        ## #{header_data[:title]}
+          ## #{header_data[:title]}
 
-        #{header_data[:body]}
+          #{header_data[:body]}
         HERE
       end
     else
       insert_into_readme do
-        <<-HERE.gsub(/^ {8}/, '')
+        <<~HERE
 
-        ## #{header_data[:title]}
+          ## #{header_data[:title]}
         HERE
       end
     end

data/lib/potassium/recipes/active_storage.rb

@@ -0,0 +1,40 @@
+class Recipes::ActiveStorage < Rails::AppBuilder
+  def ask
+    active_storage = answer(:active_storage) do
+      Ask.confirm("Do you want to use ActiveStorage for uploads?")
+    end
+
+    set(:active_storage, active_storage)
+  end
+
+  def create
+    return unless selected?(:active_storage)
+    add_active_storage
+  end
+
+  def install
+    add_active_storage
+  end
+
+  def installed?
+    file_exist?('config/storage.yml')
+  end
+
+  private
+
+  def add_active_storage
+    after(:gem_install) { run("bundle exec rails active_storage:install") }
+
+    add_readme_section :internal_dependencies, :storage
+
+    copy_file("../assets/config/storage.yml", "config/storage.yml", force: true)
+
+    append_to_file '.env.development', "AWS_REGION=\n"
+    append_to_file '.env.development', "S3_BUCKET=\n"
+
+    raise_delivery_errors_regexp = /config.active_storage.service = :local\n/
+    gsub_file 'config/environments/production.rb', raise_delivery_errors_regexp do
+      "config.active_storage.service = :amazon"
+    end
+  end
+end

data/lib/potassium/recipes/admin.rb

@@ -32,7 +32,7 @@ class Recipes::Admin < Rails::AppBuilder
   private
 
   def add_active_admin
-    gather_gem 'activeadmin', github: 'activeadmin'
+    gather_gem 'activeadmin', '~> 1.3.0'
     gather_gem 'activeadmin_addons'
     gather_gem 'active_skin'
 
@@ -41,16 +41,16 @@ class Recipes::Admin < Rails::AppBuilder
       line = "ActiveAdmin.setup do |config|"
       initializer = "config/initializers/active_admin.rb"
       gsub_file initializer, /(#{Regexp.escape(line)})/mi do |_match|
-        <<-HERE.gsub(/^ {11}/, '')
-           class CustomFooter < ActiveAdmin::Component
-             def build _arg
-               super(id: "footer")
-               para "Powered by Platanus"
-             end
-           end\n
-           ActiveAdmin.setup do |config|
-             config.view_factory.footer = CustomFooter
-           HERE
+        <<~HERE
+          class CustomFooter < ActiveAdmin::Component
+            def build _arg
+              super(id: "footer")
+              para "Powered by Platanus"
+            end
+          end\n
+          ActiveAdmin.setup do |config|
+            config.view_factory.footer = CustomFooter
+        HERE
       end
 
       line = "@import \"active_admin/base\";"
@@ -58,15 +58,15 @@ class Recipes::Admin < Rails::AppBuilder
       style = File.exist?(style) ? style : "app/assets/stylesheets/active_admin.scss"
 
       gsub_file style, /(#{Regexp.escape(line)})/mi do |_match|
-        <<-HERE.gsub(/^ {11}/, '')
-           #{line}
-           $skinActiveColor: #001CEE;
-           $skinHeaderBck: #002744;
-           $panelHeaderBck: #002744;
-           //$skinLogo: $skinHeaderBck image-url("logo_admin.png") no-repeat center center;
+        <<~HERE
+          #{line}
+          $skinActiveColor: #001CEE;
+          $skinHeaderBck: #002744;
+          $panelHeaderBck: #002744;
+          //$skinLogo: $skinHeaderBck image-url("logo_admin.png") no-repeat center center;
 
-           @import "active_skin";
-           HERE
+          @import "active_skin";
+        HERE
       end
 
       generate "activeadmin_addons:install"

data/lib/potassium/recipes/aws_sdk.rb

@@ -1,5 +1,7 @@
 class Recipes::AwsSdk < Rails::AppBuilder
   def create
-    gather_gem('aws-sdk', '~> 2.5')
+    gather_gem('aws-sdk', '~> 3')
+
+    template("../assets/aws.rb", "config/initializers/aws.rb", force: true)
   end
 end

data/lib/potassium/recipes/ci.rb

@@ -1,49 +1,48 @@
 class Recipes::Ci < Rails::AppBuilder
   def create
-    if get(:heroku)
-      copy_file '../assets/Dockerfile.ci', 'Dockerfile.ci'
-      copy_file '../assets/circle.yml', 'circle.yml'
+    copy_file '../assets/Dockerfile.ci', 'Dockerfile.ci'
+    copy_file '../assets/.circleci/config.yml', '.circleci/config.yml'
 
-      template '../assets/bin/cibuild.erb', 'bin/cibuild'
-      run "chmod a+x bin/cibuild"
+    template '../assets/bin/cibuild.erb', 'bin/cibuild'
+    run "chmod a+x bin/cibuild"
 
-      copy_file '../assets/docker-compose.ci.yml', 'docker-compose.ci.yml'
+    copy_file '../assets/docker-compose.ci.yml', 'docker-compose.ci.yml'
 
-      gather_gems(:test) do
-        gather_gem 'rspec_junit_formatter', '0.2.2'
-      end
+    gather_gems(:test) do
+      gather_gem 'rspec_junit_formatter', '0.2.2'
+    end
 
-      compose = DockerHelpers.new('docker-compose.ci.yml')
+    compose = DockerHelpers.new('docker-compose.ci.yml')
 
-      if selected?(:database, :mysql)
-        service = <<-YAML
+    if selected?(:database, :mysql)
+      srv =
+        <<~YAML
           image: "mysql:5.6.23"
           environment:
             MYSQL_ALLOW_EMPTY_PASSWORD: 'true'
         YAML
-        compose.add_service("mysql", service)
-        compose.add_link('test', 'mysql')
-        compose.add_env('test', 'MYSQL_HOST', 'mysql')
-        compose.add_env('test', 'MYSQL_PORT', '3306')
-
-      elsif selected?(:database, :postgresql)
-        service = <<-YAML
+      compose.add_service("mysql", srv)
+      compose.add_link('test', 'mysql')
+      compose.add_env('test', 'MYSQL_HOST', 'mysql')
+      compose.add_env('test', 'MYSQL_PORT', '3306')
+
+    elsif selected?(:database, :postgresql)
+      srv =
+        <<~YAML
           image: "postgres:9.4.5"
           environment:
             POSTGRES_USER: postgres
             POSTGRES_PASSWORD: ''
         YAML
-        compose.add_service("postgresql", service)
-        compose.add_link('test', 'postgresql')
-        compose.add_env('test', 'POSTGRESQL_USER', 'postgres')
-        compose.add_env('test', 'POSTGRESQL_HOST', 'postgresql')
-        compose.add_env('test', 'POSTGRESQL_PORT', '5432')
-      end
-
-      add_readme_header :ci
+      compose.add_service("postgresql", srv)
+      compose.add_link('test', 'postgresql')
+      compose.add_env('test', 'POSTGRESQL_USER', 'postgres')
+      compose.add_env('test', 'POSTGRESQL_HOST', 'postgresql')
+      compose.add_env('test', 'POSTGRESQL_PORT', '5432')
     end
 
-    uglifier = "  config.assets.js_compressor = :uglifier\n"
-    insert_into_file 'config/environments/test.rb', uglifier, after: "configure do\n"
+    add_readme_header :ci
+
+    application 'config.assets.js_compressor = :uglifier', env: 'test'
   end
 end

data/lib/potassium/recipes/database.rb

@@ -30,7 +30,7 @@ class Recipes::Database < Rails::AppBuilder
 
   def databases(database)
     databases = {
-      postgresql: { name: 'postgresql', gem_name: 'pg', relational: true },
+      postgresql: { name: 'postgresql', gem_name: 'pg', version: '~> 0.21', relational: true },
       mysql: { name: 'mysql', gem_name: 'mysql2', version: '~> 0.3.18', relational: true }
     }
     databases[database]
@@ -40,6 +40,7 @@ class Recipes::Database < Rails::AppBuilder
     remove_file 'config/database.yml'
     template "../assets/config/database_#{db[:name]}.yml.erb", 'config/database.yml'
     discard_gem 'sqlite3'
+    gather_gem 'strong_migrations'
     if db[:version]
       gather_gem db[:gem_name], db[:version]
     else

data/lib/potassium/recipes/draper.rb

@@ -21,7 +21,7 @@ class Recipes::Draper < Rails::AppBuilder
   end
 
   def add_draper
-    gather_gem 'draper', '3.0.0.pre1'
+    gather_gem 'draper', '3.0.1'
     add_readme_section :internal_dependencies, :draper
     create_file 'app/decorators/.keep'
   end

data/lib/potassium/recipes/env.rb

@@ -9,11 +9,11 @@ class Recipes::Env < Rails::AppBuilder
     append_to_file '.gitignore', ".env\n"
 
     env_config =
-      <<-RUBY.gsub(/^ {7}/, '')
-         config.before_configuration do
-           Dotenv.load(Dotenv::Railtie.root.join('.env.development'))
-         end
-         RUBY
-    application env_config.strip, env: 'test'
+      <<~RUBY
+        config.before_configuration do
+          Dotenv.load(Dotenv::Railtie.root.join('.env.development'))
+        end
+      RUBY
+    application env_config, env: 'test'
   end
 end

data/lib/potassium/recipes/i18n.rb

@@ -19,8 +19,7 @@ class Recipes::I18n < Rails::AppBuilder
       template('../assets/es-CL.yml', 'config/locales/es-CL.yml')
     end
 
-    gsub_file 'config/application.rb', /< Rails::Application/ do
-      "< Rails::Application\n    config.i18n.default_locale = '#{get(:lang)}'\n    config.i18n.fallbacks = [:es, :en]\n"
-    end
+    application("config.i18n.default_locale = '#{get(:lang)}'")
+    application("config.i18n.fallbacks = [:es, :en]")
   end
 end

data/lib/potassium/recipes/paperclip.rb

@@ -24,17 +24,17 @@ class Recipes::Paperclip < Rails::AppBuilder
   def add_paperclip
     gather_gem 'paperclip', '~> 5.0'
     paperclip_config =
-      <<-RUBY.gsub(/^ {7}/, '')
-         config.paperclip_defaults = {
-           storage: :s3,
-           s3_protocol: 'https'
-           s3_region: ENV.fetch('AWS_REGION', 'us-east-1'),
-           s3_credentials: {
-             bucket: ENV['S3_BUCKET']
-           }
-         }
-         RUBY
-    application paperclip_config.strip, env: 'production'
+      <<~RUBY
+        config.paperclip_defaults = {
+          storage: :s3,
+          s3_protocol: 'https',
+          s3_region: ENV.fetch('AWS_REGION', 'us-east-1'),
+          s3_credentials: {
+            bucket: ENV['S3_BUCKET']
+          }
+        }
+      RUBY
+    application paperclip_config, env: 'production'
     append_to_file '.env.development', "S3_BUCKET=\n"
     append_to_file '.gitignore', "/public/system/*\n"
     add_readme_section :internal_dependencies, :paperclip

data/lib/potassium/recipes/puma.rb

@@ -7,11 +7,6 @@ class Recipes::Puma < Rails::AppBuilder
     copy_file '../assets/config/puma.rb', 'config/puma.rb', force: true
 
     # Configure rack-timout
-    rack_timeout_config =
-      <<-RUBY.gsub(/^ {9}/, '')
-         Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
-         RUBY
-
-    append_file "config/environments/production.rb", rack_timeout_config
+    application "Rack::Timeout.timeout = (ENV[\"RACK_TIMEOUT\"] || 10).to_i", env: "production"
   end
 end

data/lib/potassium/recipes/rack_cors.rb

@@ -1,21 +1,26 @@
 class Recipes::RackCors < Rails::AppBuilder
+  def install
+    create
+  end
+
   def create
     gather_gem('rack-cors', '~> 0.4.0')
     after(:gem_install) do
       rack_cors_config =
-        <<-RUBY.gsub(/^ {7}/, '')
-           config.middleware.insert_before 0, Rack::Cors do
-             allow do
-               origins '*'
-               resource '*',
-                 headers: :any,
-                 expose: ['X-Page', 'X-PageTotal'],
-                 methods: [:get, :post, :delete, :put, :options]
-             end
-           end
-           RUBY
+        <<~RUBY
+          config.middleware.insert_before 0, Rack::Cors do
+            allow do
+              origins '*'
+              resource '*',
+                headers: :any,
+                expose: ['X-Page', 'X-PageTotal'],
+                methods: [:get, :post, :delete, :put, :options]
+            end
+          end
+
+        RUBY
 
-      application rack_cors_config.strip
+      application rack_cors_config
     end
   end
 end

data/lib/potassium/recipes/rails.rb

@@ -1,5 +1,18 @@
 class Recipes::Rails < Rails::AppBuilder
   def create
+    gather_gem("bootsnap", require: false)
+
     environment 'config.force_ssl = true', env: 'production'
+
+    line = "Rails.application.config.content_security_policy_nonce_generator = \
+-> request { SecureRandom.base64(16) }"
+    initializer = "config/initializers/content_security_policy.rb"
+    gsub_file initializer, /(#{Regexp.escape(line)})/mi do |_match|
+      <<~HERE.chomp
+        # Rails.application.config.content_security_policy_nonce_generator = -> request do
+        #   SecureRandom.base64(16)
+        # end
+      HERE
+    end
   end
 end

data/lib/potassium/recipes/ruby.rb

@@ -4,7 +4,7 @@ require 'semantic'
 class Recipes::Ruby < Rails::AppBuilder
   def create
     info "Using ruby version #{version_alias}"
-    create_file '.ruby-version', version_alias
+    create_file '.ruby-version', version_alias, force: true
   end
 
   private

data/lib/potassium/recipes/testing.rb

@@ -2,7 +2,7 @@ class Recipes::Testing < Rails::AppBuilder
   def create
     gather_gems(:development, :test) do
       gather_gem('rspec-rails')
-      gather_gem('factory_girl_rails')
+      gather_gem('factory_bot_rails')
       gather_gem('faker')
       gather_gem('guard-rspec', require: false)
       gather_gem('rspec-nc', require: false)

data/lib/potassium/templates/application.rb

@@ -30,6 +30,7 @@ run_action(:asking) do
   ask :i18n
   ask :api
   ask :draper
+  ask :active_storage
   ask :paperclip
   ask :heroku
   ask :github
@@ -67,6 +68,7 @@ run_action(:recipe_loading) do
   create :draper
   create :power_types
   create :rack_cors
+  create :active_storage
   create :paperclip
   create :tzinfo
   create :script

data/lib/potassium/version.rb

@@ -1,6 +1,6 @@
 module Potassium
-  VERSION = "5.1.4"
-  RUBY_VERSION = "2.4.1"
-  RAILS_VERSION = "~> 5.1.3"
+  VERSION = "5.2.0"
+  RUBY_VERSION = "2.5.1"
+  RAILS_VERSION = "~> 5.2.1"
   RUBOCOP_VERSION = "~> 0.49.1"
 end

data/spec/features/active_storage_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+RSpec.describe "Active Storage" do
+  before :all do
+    drop_dummy_database
+    remove_project_directory
+    create_dummy_project("active_storage" => true)
+  end
+
+  it "customizes config file" do
+    content = IO.read("#{project_path}/config/storage.yml")
+    expect(content).to include("bucket: <%= ENV['S3_BUCKET'] %>")
+  end
+
+  it "adds brief to README file" do
+    content = IO.read("#{project_path}/README.md")
+    expect(content).to include("Active Storage")
+  end
+
+  it "uses amazon on production env" do
+    content = IO.read("#{project_path}/config/environments/production.rb")
+    expect(content).to include("config.active_storage.service = :amazon")
+  end
+
+  it "adds amazon ENV vars" do
+    content = IO.read("#{project_path}/.env.development")
+    expect(content).to include("AWS_REGION=")
+    expect(content).to include("S3_BUCKET=")
+  end
+end

data/spec/features/database_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+RSpec.describe "Database" do
+  before :all do
+    drop_dummy_database
+    remove_project_directory
+    create_dummy_project
+  end
+
+  it "adds the Strong Migrations gem to Gemfile" do
+    gemfile_content = IO.read("#{project_path}/Gemfile")
+    expect(gemfile_content).to include("gem 'strong_migrations'")
+  end
+end

data/spec/features/new_project_spec.rb

@@ -26,10 +26,18 @@ RSpec.describe "A new project" do
     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")
 
-    expect(ruby_version_file).to eq("2.4")
+    expect(ruby_version_file).to eq("2.5")
   end
 
   it "setup ssl" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potassium
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.2.0
 platform: ruby
 authors:
 - juliogarciag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,7 @@ files:
 - docs/DSL.md
 - lib/potassium.rb
 - lib/potassium/assets/.buildpacks
+- lib/potassium/assets/.circleci/config.yml
 - lib/potassium/assets/.dockerignore
 - lib/potassium/assets/.editorconfig
 - lib/potassium/assets/.env.development.erb
@@ -207,17 +208,18 @@ files:
 - lib/potassium/assets/api/draper_responder.rb
 - lib/potassium/assets/api/responder.rb
 - lib/potassium/assets/app/mailers/application_mailer.rb
+- lib/potassium/assets/aws.rb
 - lib/potassium/assets/bin/cibuild.erb
 - lib/potassium/assets/bin/setup.erb
 - lib/potassium/assets/bin/setup_heroku.erb
 - lib/potassium/assets/bin/update.erb
-- lib/potassium/assets/circle.yml
 - lib/potassium/assets/config/database_mysql.yml.erb
 - lib/potassium/assets/config/database_postgresql.yml.erb
 - lib/potassium/assets/config/mailer.rb.erb
 - lib/potassium/assets/config/puma.rb
 - lib/potassium/assets/config/secrets.yml.erb
 - lib/potassium/assets/config/sentry.rb.erb
+- lib/potassium/assets/config/storage.yml
 - lib/potassium/assets/docker-compose.ci.yml
 - lib/potassium/assets/es-CL.yml
 - lib/potassium/assets/lib/tasks/auto_annotate_models.rake
@@ -253,6 +255,7 @@ files:
 - lib/potassium/helpers/variable-helpers.rb
 - lib/potassium/newest_version_ensurer.rb
 - lib/potassium/recipe.rb
+- lib/potassium/recipes/active_storage.rb
 - lib/potassium/recipes/admin.rb
 - lib/potassium/recipes/angular_admin.rb
 - lib/potassium/recipes/annotate.rb
@@ -299,8 +302,10 @@ files:
 - potassium.gemspec
 - spec/fakes/bin/heroku
 - spec/fakes/bin/hub
+- spec/features/active_storage_spec.rb
 - spec/features/background_processor_spec.rb
 - spec/features/ci_spec.rb
+- spec/features/database_spec.rb
 - spec/features/draper_spec.rb
 - spec/features/error_reporting_spec.rb
 - spec/features/front_end.rb
@@ -334,15 +339,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An application generator from Platanus
 test_files:
 - spec/fakes/bin/heroku
 - spec/fakes/bin/hub
+- spec/features/active_storage_spec.rb
 - spec/features/background_processor_spec.rb
 - spec/features/ci_spec.rb
+- spec/features/database_spec.rb
 - spec/features/draper_spec.rb
 - spec/features/error_reporting_spec.rb
 - spec/features/front_end.rb

data/lib/potassium/assets/circle.yml

@@ -1,19 +0,0 @@
-machine:
-  services:
-    - docker
-
-dependencies:
-  override:
-    - docker-compose -f docker-compose.ci.yml pull
-    - docker-compose -f docker-compose.ci.yml build test
-    - bin/cibuild services
-    - bin/cibuild deps
-    - bin/cibuild assets
-
-database:
-  override:
-    - bin/cibuild db
-
-test:
-  override:
-    - bin/cibuild tests