mobile_workflow 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf9a3d0ae2752b171aea1043b7cc57a8425b80ecf086bb226faadffb936fd5ee
-  data.tar.gz: 1d0c4bf77cbbb66844a58a4d94bfb5532f4706a4a5fa2ae02f01e1e0f72e4939
+  metadata.gz: 652ebd5ca3b96f993ee3c6a7bc57863eaa70119fb41aca0586a02430795bd0d1
+  data.tar.gz: ab8191098d6eeed1825fd8fd1a2debb5c4ae762cfb887362793e96a7d62278ae
 SHA512:
-  metadata.gz: e3c1748bdbe2b84415e434632080968cc02fb4e6e7b5a248bf8d979868b74714ce89c0d04165207d3b67008e45b3f08e4b84f67124a128f971627ad28611591f
-  data.tar.gz: 90329d6e78a89c601fa6bb5cc62b4d856b9ba264e56d6bfe83b7e1afc5ea5d1849355ccf1beb272d2474c90b5b5ec2bca191903db9dbe465fa5141b52053dadf
+  metadata.gz: 4b4acc6286656e349602808ac82b6049da2e8ef3d721fba490346d0f003701c9efdde26fdcf9b2352df2ff3bc34d40bec571f941701129298baa02d8f356ad29
+  data.tar.gz: 7a1cfa5d993b5bfc91f98ede6e6c7000990ffd149bafe18c0f4232e80462a7fd9d0cea0eec2c020437e6cdb3dce7a14e747e4b4dfe6e4cd6886b4b28fc0905f3

data/app/models/concerns/mobile_workflow/displayable/steps/form.rb

@@ -37,18 +37,18 @@ module MobileWorkflow
           { item_type: :text, label: label, identifier: identifier, placeholder: placeholder, optional: optional, multiline: multiline, default_text_answer: default_text_answer }
         end
     
-        def mw_form_date(label:, identifier:, optional: false, default_date_time_answer: nil)
+        def mw_form_date(label:, identifier:, optional: false, default_text_answer: nil)
           raise 'Missing label' if label.nil?
           raise 'Missing identifier' if identifier.nil?
     
-          { item_type: :date, date_type: :calendar, label: label, identifier: identifier, optional: optional, default_date_time_answer: default_date_time_answer }
+          { item_type: :date, date_type: :calendar, label: label, identifier: identifier, optional: optional, default_text_answer: default_text_answer }
         end
     
-        def mw_form_time(label:, identifier:, optional: false, default_date_time_answer: nil)
+        def mw_form_time(label:, identifier:, optional: false, default_text_answer: nil)
           raise 'Missing label' if label.nil?
           raise 'Missing identifier' if identifier.nil?
     
-          { item_type: :time, label: label, identifier: identifier, optional: optional, default_date_time_answer: default_date_time_answer }
+          { item_type: :time, label: label, identifier: identifier, optional: optional, default_text_answer: default_text_answer }
         end
     
         def mw_form_email(label:, identifier:, placeholder: nil, optional: false, default_text_answer: nil)

data/config/initializers/add_frozen_string_literal.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# Adds a `frozen_string_literal` comment to the top of files created by Rails generators.
+# Taken from https://gist.github.com/thornomad/4e2f0905e2a4a6eefbc4be5772dfd4f7#gistcomment-3533276
+#
+# Warning! Doorkeeper auto generated files already include `frozen_string_literal`, so it will be duplicated.
+
+return unless defined?(::Rails::Generators)
+
+module RailsGeneratorFrozenStringLiteralPrepend
+  RUBY_EXTENSIONS = %w[.rb .rake]
+
+  def render
+    return super unless RUBY_EXTENSIONS.include? File.extname(self.destination)
+    "# frozen_string_literal: true\n\n" + super
+  end
+end
+
+Thor::Actions::CreateFile.prepend RailsGeneratorFrozenStringLiteralPrepend

data/lib/generators/mobile_workflow/install/install_generator.rb

@@ -67,6 +67,10 @@ module MobileWorkflow
         end
       end
 
+      def ability_generator
+        copy_file("app/models/ability.rb")
+      end
+
       def generate_deserializers
         say "Generating deserializers"
 
@@ -99,7 +103,7 @@ module MobileWorkflow
           route "resources :#{plural_controller_name}, only: [#{actions.map{|a| ":#{a}"}.join(", ")}]"
         end
       end
-      
+
       def generate_seeds
         template("seeds.rb.erb", "db/seeds.rb", force: true)
       end

data/lib/generators/mobile_workflow/install/templates/Gemfile.erb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby '<%= MobileWorkflow::RUBY_VERSION %>'
 
 # Core Gems
-gem 'rails', '<%= MobileWorkflow::RAILS_VERSION %>'
 gem 'puma', '~> 5.0'
+gem 'rails', '<%= MobileWorkflow::RAILS_VERSION %>'
 gem 'sass-rails', '>= 6'
 gem 'turbolinks', '~> 5'
 
@@ -14,10 +16,12 @@ gem 'mobile_workflow', '<%= MobileWorkflow::VERSION %>'
 
 # Authorisation / Authentication
 <%- if options[:doorkeeper_oauth] %>
-gem 'doorkeeper'
 gem 'bcrypt'
 <%- end %>
 gem 'cancancan', '~> 3.1'
+<%- if options[:doorkeeper_oauth] %>
+gem 'doorkeeper'
+<%- end %>
 
 # Admin console
 gem 'administrate', '~> 0.13.0'
@@ -26,26 +30,39 @@ gem 'administrate-field-enum'
 
 <%- if options[:s3_storage] %>
 # Backend storage for S3
-gem "image_processing"
 gem 'aws-sdk-s3', '~> 1.60', '>= 1.60.1'
 gem 'aws-sdk-sns', '~> 1.23'
+gem "image_processing"
 <%- end %>
 
 # FFI for Mac M1
 gem 'ffi', '~> 1.15.1'
 
+# Error tracking
+gem 'rollbar'
+
+# Data migrations
+gem 'data_migrate', '~> 7.0.0'
+
 group :development do
-  gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'web-console', '>= 3.3.0'
 end
 
 group :development, :test do
-  gem 'sqlite3'
-  gem 'rspec-rails', '~> 4.0.0'
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  gem 'byebug', platforms: %i[mri mingw x64_mingw]
   gem 'dotenv-rails'
   gem 'factory_bot_rails'
+  gem 'rspec-rails', '~> 4.0.0'
+  gem 'rubocop', '~> 1.16', require: false
+  gem 'rubocop-rails', '~> 2.10.0', require: false
+  gem 'rubocop-rspec', '~> 2.3.0', require: false
   gem "rufo"
+  gem 'sqlite3'
+end
+
+group :test do
+  gem 'simplecov', '~> 0.21.2', require: false
 end
 
 group :production do

data/lib/generators/mobile_workflow/install/templates/api_controller.rb.erb

@@ -10,7 +10,7 @@ class ApiController < ActionController::API
   def current_resource_owner
     @current_resource_owner ||= User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token&.accessible?
   end
-  alias_method :current_user, :current_resource_owner
+  alias current_user current_resource_owner
   
   protected
   def anonymous_action?

data/lib/generators/mobile_workflow/install/templates/app/helpers/application_helper.rb

@@ -1,9 +1,8 @@
 module ApplicationHelper
-  
   def bootstrap_class_for(flash_type)
     { success: "alert-success", error: "alert-danger", alert: "alert-warning", notice: "alert-info" }.stringify_keys[flash_type.to_s] || flash_type.to_s
   end
-  
+
   def flash_messages
     flash.each do |flash_type, message|
       concat(content_tag(:div, message, class: "alert #{bootstrap_class_for(flash_type)}", role: 'alert'))

data/lib/generators/mobile_workflow/install/templates/{ability.rb → app/models/ability.rb}

@@ -1,7 +1,7 @@
 class Ability
   include CanCan::Ability
 
-  def initialize(user)
+  def initialize(_user)
     can :manage, :all
   end
 end

data/lib/generators/mobile_workflow/install/templates/app/models/application_record.rb

@@ -1,6 +1,6 @@
 class ApplicationRecord < ActiveRecord::Base
   include MobileWorkflow::Attachable
   include MobileWorkflow::Displayable
-  
+
   self.abstract_class = true
-end
+end

data/lib/generators/mobile_workflow/install/templates/config/initializers/mobile_workflow_rollbar.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module MobileWorkflow
+  class ApplicationJob < ActiveJob::Base
+    include Rollbar::ActiveJob
+  end
+end

data/lib/generators/mobile_workflow/install/templates/deserializer_spec.rb.erb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'rails_helper'
 require 'json'
 

data/lib/generators/mobile_workflow/install/templates/seeds.rb.erb

@@ -1,4 +1,4 @@
 <%- if options[:doorkeeper_oauth] %>
 # You can set the OAuth client ID and client secret in your ENV in order to avoid them being reset each time you reset the database.
 Doorkeeper::Application.create! name: 'Main App', redirect_uri: 'mww://callback', scopes: 'public', uid: ENV['OAUTH_CLIENT_ID'], secret: ENV['OAUTH_CLIENT_SECRET']
-<%- end %>
+<%- end %>

data/lib/generators/mobile_workflow/install/templates/sessions_controller.rb.erb

@@ -1,10 +1,9 @@
 class SessionsController < ApplicationController
-  def new
-  end
+  def new; end
 
   def create
     @user = User.find_by("LOWER(email)= ?", params[:email].downcase)
-    if @user && @user.authenticate(params[:password])
+    if @user&.authenticate(params[:password])
       session[:user_id] = @user.id
       redirect_to params[:return_to] || root_url
     else
@@ -12,4 +11,4 @@ class SessionsController < ApplicationController
       render :new
     end
   end
-end
+end

data/lib/generators/mobile_workflow/install/templates/user.rb.erb

@@ -1,8 +1,8 @@
 class User < ApplicationRecord
   has_secure_password
 
-  has_many :access_grants, class_name: 'Doorkeeper::AccessGrant', foreign_key: :resource_owner_id, dependent: :destroy
-  has_many :access_tokens, class_name: 'Doorkeeper::AccessToken', foreign_key: :resource_owner_id, dependent: :destroy
+  has_many :access_grants, class_name: 'Doorkeeper::AccessGrant', foreign_key: :resource_owner_id, inverse_of: :resource_owner, dependent: :destroy
+  has_many :access_tokens, class_name: 'Doorkeeper::AccessToken', foreign_key: :resource_owner_id, inverse_of: :resource_owner, dependent: :destroy
 
   validates :email, presence: true, uniqueness: true
 end

data/lib/generators/mobile_workflow/templates/controller.rb.erb

@@ -4,19 +4,19 @@ class <%= controller_class_name %>Controller < ApiController
   before_action :rewrite_payload, only: :create
 
   load_and_authorize_resource
-  
+
 <% if index_action? -%>
   def index
     render json: @<%= plural_table_name %>.collect(&:list_item_as_json)
   end
-  
 <% end -%>
+
 <% if show_action? -%>
   def show
     render json: @<%= singular_table_name %>.display_as_json
   end
-  
 <% end -%>
+
 <% if create_action? -%>
   def create
     <% if doorkeeper_oauth? -%>

data/lib/generators/mobile_workflow/templates/controller_spec.rb.erb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'rails_helper'
 require 'json'
 
@@ -11,50 +9,60 @@ RSpec.describe <%= controller_class_name %>Controller do
   let(:token) { instance_double(Doorkeeper::AccessToken, accessible?: true, acceptable?: true, resource_owner_id: user.id) }
   <% end -%>
 
-<% if index_action? -%>  
+<% if index_action? -%>
   describe 'GET #index' do
     let!(:<%= controller_class_name.singularize.underscore %>) { create(:<%= controller_class_name.singularize.underscore %>) }
+
     before(:each) do
       <% if doorkeeper_oauth? -%>
       allow(subject).to receive(:doorkeeper_token) { token }
       <% end -%>
 	    get :index, params: params
 	  end
-    
+
     context 'ok' do
       it { expect(json_response[0][:id]).to eq <%= controller_class_name.singularize.underscore %>.id }               
       it { expect(response.status).to eq 200 }
     end
   end
 <% end -%>
+
 <% if show_action? -%>
   describe 'GET #show' do
     let(:<%= controller_class_name.singularize.underscore %>) { create(:<%= controller_class_name.singularize.underscore %>) }
     let(:params) { { id: <%= controller_class_name.singularize.underscore %>.id } }
+
     before(:each) do
       <% if doorkeeper_oauth? -%>
       allow(subject).to receive(:doorkeeper_token) { token }
       <% end -%>
 	    get :show, params: params
 	  end
-    
-    context 'ok' do                
+
+    context 'ok' do
       it { expect(response.status).to eq 200 }
     end
   end
-
 <% end -%>
+
 <% if create_action? -%>
   describe 'POST #create' do
-    let(:payload_params) { {text: 'OK'} }
+    let(:payload_params) {
+      {
+    <% attributes_names.each do |attribute| -%>
+    <%= attribute %>: 'string',
+    <% end -%>
+      }
+    }
     let(:params) { { payload: payload_params, binaries: [{identifier: 'record', mimetype: 'video/mp4'}] } }
+
     before(:each) do
       <% if doorkeeper_oauth? -%>
       allow(subject).to receive(:doorkeeper_token) { token }
       <% end -%>
 	    post :create, params: params
 	  end
-    
+
     context 'ok' do
       it { expect(<%= controller_class_name.singularize %>.count).to eq 1 }          
       it { expect(response.status).to eq 201 }

data/lib/generators/mobile_workflow/templates/model.rb.erb

@@ -11,8 +11,8 @@ class <%= class_name %> < <%= parent_class_name.classify %>
 <% end -%>
 <% if class_name == 'User' -%>
 <% if doorkeeper_oauth? -%>
-  has_many :access_grants, class_name: 'Doorkeeper::AccessGrant', foreign_key: :resource_owner_id, dependent: :destroy
-  has_many :access_tokens, class_name: 'Doorkeeper::AccessToken', foreign_key: :resource_owner_id, dependent: :destroy
+  has_many :access_grants, class_name: 'Doorkeeper::AccessGrant', foreign_key: :resource_owner_id, inverse_of: :resource_owner, dependent: :destroy
+  has_many :access_tokens, class_name: 'Doorkeeper::AccessToken', foreign_key: :resource_owner_id, inverse_of: :resource_owner, dependent: :destroy
 <% end -%>
 <% attributes.each do |attribute| -%>
 <% if attribute.name == 'email' -%>

data/lib/mobile_workflow/cli/app_builder.rb

@@ -48,10 +48,6 @@ CODE
       generate 'administrate:routes'
     end
     
-    def ability_generator
-      copy_file 'ability.rb', 'app/models/ability.rb'
-    end
-    
     def active_storage
       rails_command 'active_storage:install'
       copy_file 'storage.s3.yml', 'config/storage.yml'
@@ -78,6 +74,27 @@ ADMIN_USER=#{admin_user}
 ADMIN_PASSWORD=#{admin_password}
 CODE
     end
+
+    def rubocop
+      copy_file '.rubocop.yml'
+      command = 'rubocop --auto-gen-config'
+
+      puts "Running: #{command}"
+      output = `#{command}`
+      puts "Output: #{output}"
+    end
+    
+    def simplecov
+      append_to_file 'spec/rails_helper.rb', "\n# Config for Test Coverage\nrequire 'simplecov'\nSimpleCov.start\nSimpleCov.minimum_coverage 80\n"
+      append_to_file '.gitignore', "\n# Ignore test coverage reports\n/coverage\n"
+    end
+    
+    def rollbar
+      generate 'rollbar'
+      gsub_file 'config/initializers/rollbar.rb', 'if Rails.env.test?', 'if Rails.env.test? || Rails.env.development?'
+      copy_file 'config/initializers/mobile_workflow_rollbar.rb'
+      gsub_file 'app/jobs/application_job.rb', 'class ApplicationJob < ActiveJob::Base', "class ApplicationJob < ActiveJob::Base\n  include Rollbar::ActiveJob\n"
+    end
     
     def git_commit(message = 'Initial commit')
       git add: "."

data/lib/mobile_workflow/cli/app_server_generator.rb

@@ -34,13 +34,15 @@ module MobileWorkflow::Cli
         build :procfiles
         build :rspec_generator
         build :factory_bot
-        build :ability_generator
+        build :simplecov
+        build :rollbar
         build :active_storage if options[:s3_storage] 
         build :mobile_workflow_generator, ARGV[1]
         build :migrate_db
         build :administrate_generator
         build :format_source
         build :generate_dot_env
+        build :rubocop
         build :git_commit
         build :heroku if options[:heroku]
         build :dokku, options[:dokku_host] if options[:dokku]

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.7.7'
+  VERSION = '0.7.8'
   RUBY_VERSION = '2.7.3'
   RAILS_VERSION = '6.1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobile_workflow
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -146,6 +146,7 @@ files:
 - app/models/concerns/mobile_workflow/displayable/steps/styled_content/stack.rb
 - app/views/layouts/mobile_workflow/application.html.erb
 - bin/mwf
+- config/initializers/add_frozen_string_literal.rb
 - config/routes.rb
 - lib/generators/mobile_workflow/controller_generator.rb
 - lib/generators/mobile_workflow/install/install_generator.rb
@@ -153,12 +154,13 @@ files:
 - lib/generators/mobile_workflow/install/templates/Procfile
 - lib/generators/mobile_workflow/install/templates/Procfile.dev
 - lib/generators/mobile_workflow/install/templates/README.md.erb
-- lib/generators/mobile_workflow/install/templates/ability.rb
 - lib/generators/mobile_workflow/install/templates/api_controller.rb.erb
 - lib/generators/mobile_workflow/install/templates/app/helpers/application_helper.rb
+- lib/generators/mobile_workflow/install/templates/app/models/ability.rb
 - lib/generators/mobile_workflow/install/templates/app/models/application_record.rb
 - lib/generators/mobile_workflow/install/templates/app/views/layouts/application.html.erb
 - lib/generators/mobile_workflow/install/templates/app/views/sessions/new.html.erb
+- lib/generators/mobile_workflow/install/templates/config/initializers/mobile_workflow_rollbar.rb
 - lib/generators/mobile_workflow/install/templates/create_users.rb
 - lib/generators/mobile_workflow/install/templates/deserializer.rb.erb
 - lib/generators/mobile_workflow/install/templates/deserializer_spec.rb.erb
@@ -205,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: A Rails engine to provide API support for Mobile Workflow Apps.