underlay 1.50.1 → 1.52.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fe8523d018762fed74e94b455407b356d91c32e26558db70044b366e4971ae3
-  data.tar.gz: a3e90a69b043ba06d48e694b34d16da30f7fb7f8f41b391bc2d96df66e599f27
+  metadata.gz: 9dde78cb7d8ba8f2c8c7f93250425fb19b24ebb44907faacf37453e5d293a109
+  data.tar.gz: 1a5a24be479c3750e32430ffa8e08fe2eb595e7a4c6657d06cd9661c76dfa247
 SHA512:
-  metadata.gz: cc80e1ba6629d92fb1977b5159e850ff4f3d9dd5579025e28e245f9cbacd7bfd321e9f2d8b221dfc8ccf268dd096088cebaeaad848e2f7da6e0208a9af276665
-  data.tar.gz: 7c6d8069f5b175fd5495181a714fa87b5bf4ab6a753a838aa43df888a354656a62592d435cf46c0cdc2f62004d891a186e586be04c46ab6dc2057b8c6ec9f35f
+  metadata.gz: fbd4a1c9931e083852d4d11af6b644a735ee9ea4f83b5ec956d38de51e2360f7e1bcd1799b58e6bf15c0740c78246797b31d21b25375d5c042a16b0819f20608
+  data.tar.gz: cba387c279816491b9ea3fac214480750b48391842baf47d26e8bc2bd34cfde93700f50dc5278d6400d74d229cee1c6c997137ddb81439b8abb48ec2798b6c81

data/README.md

@@ -12,7 +12,7 @@ Then run:
 
     underlay projectname
 
-This will create a Rails app in `projectname` using the latest version of Rails.
+This will create a Rails API app in `projectname` using the latest version of Rails.
 
 ### Associated services
 
@@ -155,13 +155,13 @@ around stale code not being refreshed.
 If you think your application is running old code, run `spring stop`.
 And if you'd rather not use spring, add `DISABLE_SPRING=1` to your login file.
 
-## Api
+## Application mode
 
-You can set app to API mode:
+You can set Application mode:
 
-`underlay app --api true`
+`underlay app --application_mode true`
 
-This creates API application without assets and action cable.
+This creates full Rails application including assets and action cable.
 
 ## Dependencies
 
@@ -173,10 +173,10 @@ PostgreSQL needs to be installed and running for the `db:create` rake task.
 
 - [X] Install TwilioBase gem (if the option is set)
 - [x] Remove duplicate application.html.erb layout
-- [ ] Fix issue with flashes.scss partial not being added to assets
+- [X] Fix issue with flashes.scss partial not being added to assets
 - [ ] Configure s3 buckets and ENV vars
-- [ ] Manually check all files are created and in place
-- [ ] Configure Redis on heroku (with config vars + initializer)
+- [X] Manually check all files are created and in place
+- [X] Configure Redis on heroku (with config vars + initializer)
 - [X] Update rake (in generated project) to run lints
 - [X] Prevent views and static sites from generating in API mode
 - [ ] Setup default front-end libraries and depencies

data/lib/underlay/app_builder.rb

@@ -429,6 +429,7 @@ module Underlay
       copy_file 'errors.rb', 'config/initializers/errors.rb'
       copy_file 'json_encoding.rb', 'config/initializers/json_encoding.rb'
       copy_file 'lograge.rb', 'config/initializers/lograge.rb'
+      copy_file 'redis.rb', 'config/initializers/redis.rb'
       copy_file 'sentry.rb', 'config/initializers/sentry.rb'
     end
 
@@ -504,7 +505,7 @@ module Underlay
         "if Rails.root.join('tmp', 'caching-dev.txt').exist?"
       )
 
-      simple_form_corrections unless options[:api]
+      simple_form_corrections unless api_mode?
     end
 
     def non_api_files_removal
@@ -546,11 +547,15 @@ module Underlay
     end
 
     def mode_dependent_files
-      if options[:api]
+      if api_mode?
         ['initializers/cors.rb']
       else
         ['initializers/simple_form.rb']
       end
     end
+
+    def api_mode?
+      options[:application_mode].blank?
+    end
   end
 end

data/lib/underlay/generators/app_generator.rb

@@ -7,6 +7,10 @@ module Underlay
   class AppGenerator < Rails::Generators::AppGenerator
     hide!
 
+    class_option :application_mode,
+      type: :boolean, default: false,
+      desc: 'Application mode is enabled'
+
     class_option :database,
       type: :string, aliases: '-d', default: 'postgresql',
       desc: "Configure for selected database (options: #{DATABASES.join('/')})"
@@ -47,6 +51,18 @@ module Underlay
       type: :boolean, aliases: '-v', group: :underlay,
       desc: 'Show Underlay version number and quit'
 
+    def initialize(*args)
+      super
+
+      if api_mode?
+        self.options = options.merge(
+          api: true,
+          skip_sprockets: true,
+          skip_javascript: true
+        ).freeze
+      end
+    end
+
     def finish_template
       invoke :underlay_customization
       super
@@ -266,15 +282,19 @@ module Underlay
     end
 
     def build_for_non_api(args)
-      return if options[:api]
+      return if api_mode?
 
       build args
     end
 
     def build_for_api(args)
-      return unless options[:api]
+      return unless api_mode?
 
       build args
     end
+
+    def api_mode?
+      options[:application_mode].blank?
+    end
   end
 end

data/lib/underlay/version.rb

@@ -6,5 +6,5 @@ module Underlay
     .read("#{File.dirname(__FILE__)}/../../.ruby-version")
     .strip
     .freeze
-  VERSION = '1.50.1'
+  VERSION = '1.52.1'
 end

data/templates/Gemfile.erb

@@ -55,6 +55,7 @@ group :development, :test do
   gem 'pry-rails'
   gem 'rspec-rails', '~> 3.6'
   gem 'rubocop', require: false
+  gem 'underlay'
   <% unless options[:api] -%>
     gem 'scss_lint', require: false
     gem 'slim_lint', require: false

data/templates/application.example.yml

@@ -4,6 +4,7 @@ default: &default
   PORT: '3000'
   RACK_ENV: 'development'
   RACK_MINI_PROFILER: '0'
+  REDISTOGO_URL: 'redis://localhost'
   SECRET_KEY_BASE: 'development_secret'
   EXECJS_RUNTIME: 'Node'
   SMTP_ADDRESS: ''

data/templates/redis.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+uri = URI.parse(ENV.fetch('REDISTOGO_URL'))
+REDIS = Redis.new(url: uri)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: underlay
 version: !ruby/object:Gem::Version
-  version: 1.50.1
+  version: 1.52.1
 platform: ruby
 authors:
 - dvelp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,6 +138,7 @@ files:
 - templates/puma.rb
 - templates/rack_mini_profiler.rb
 - templates/rails_helper.rb
+- templates/redis.rb
 - templates/rubocop.yml.erb
 - templates/scss-lint.yml.erb
 - templates/secrets.yml