mobile_workflow 0.6.8 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 685158e15df7ff0f9d893db92dcb1446827e3a8ad61db0a18f76ca95904b4d29
-  data.tar.gz: 223f09dd75966eec26028fa1c17bdcc2ab7ddaf01a5c73a119817c22064b81f7
+  metadata.gz: db9e697a2d4bc53ea4b9a231248f9d32c21199d030a75826e0c006055e9828ed
+  data.tar.gz: 7658139e3a461174483e4adde83327da338b73a84ef4e9e6f9423903b8e3b2d2
 SHA512:
-  metadata.gz: ae81fb8cfc35faf25aacb35ecab0a46deb91c706c7c280aaa3b41d090dd9ff88a8c2480ce21d07c2f2e6190268c8fa7794dc4565ef441e488c19146ede830258
-  data.tar.gz: 99801e61d43ccf7d64a533b7c786001444359a7e3b244b4443805d588310de9f4dfa4b14979be40fa19867ecd70436cda26f308b840d1fe00157ba919158decc
+  metadata.gz: 3c5ca58a42c0634029ce8d7b43e04b1383c930d673ca6c2418911767227bc4ae2bebaab3afed5bc3981085ede273ab242253c7be2560eef92df71533fb88bd8c
+  data.tar.gz: '018017ea7b7d4baeb4372c0159267bb632fc33a14eeb9c67d0de117f27372cebb8df8e09f9f90604fdea5842093a93966a1e3f24a4102c40e0aa65638e7f4ecd'

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

@@ -4,12 +4,16 @@ module MobileWorkflow
     include Rails.application.routes.url_helpers
     
     ON_SUCCESS_OPTIONS = [:none, :reload, :backward, :forward]
-    BUTTON_STYLES = [:primary, :outline, :danger]
-      
+    BUTTON_STYLES = [:primary, :outline, :danger]  
+    
     def mw_list_item(id: self.id, text:, detail_text: nil, sf_symbol_name: nil, image_attachment: nil)
       mw_list_item = {id: id, text: text, detailText: detail_text, sfSymbolName: sf_symbol_name}
       mw_list_item[:imageURL] = preview_url(image_attachment, options: { resize_to_fill: [100, 100] }) if image_attachment
-      mw_list_item.compact   
+      mw_list_item.compact
+    end
+    
+    def mw_map_item(id: self.id, text:, detail_text: nil, latitude:, longitude:)
+      {id: id, text: text, detailText: detail_text, latitude: latitude, longitude: longitude}.compact
     end
   
     def mw_display_text(text:, label: nil)
@@ -54,6 +58,13 @@ module MobileWorkflow
       {type: :button, label: label, url: url, method: method, style: style, onSuccess: on_success}
     end
     
+    def mw_display_button_for_system_url(label:, apple_system_url:, android_system_url:, method: :put, style: :primary, on_success: :none)
+      validate_on_success!(on_success)
+      validate_button_style!(style)
+      
+      {type: :button, label: label, appleSystemURL: apple_system_url, androidSystemURL: android_system_url, method: method, style: style, onSuccess: on_success}
+    end
+    
     def mw_display_button_for_modal_workflow(label:, modal_workflow_name:, style: :primary, on_success: :none)
       validate_on_success!(on_success)
       validate_button_style!(style)

data/lib/generators/mobile_workflow/controller_generator.rb

@@ -30,8 +30,9 @@ module MobileWorkflow
       end
           
       def permitted_params
-        params = attributes_names.map{ |name| ":#{name}" }
-        params.join(", ")
+        permitted_attributes = attributes_names.dup
+        permitted_attributes.delete('user')
+        permitted_attributes.map{ |name| ":#{name}" }.join(", ")
       end
       
       def index_action?

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

@@ -1,9 +1,13 @@
 require "rails/generators/base"
+require "rails/generators/active_model"
+require "rails/generators/active_record/migration"
+require "active_record"
 require "mobile_workflow/open_api_spec/parser"
 
 module MobileWorkflow
   module Generators
     class InstallGenerator < Rails::Generators::Base
+      include ActiveRecord::Generators::Migration
       
       source_root File.expand_path("../templates", __FILE__)
 
@@ -20,10 +24,16 @@ module MobileWorkflow
         route "mount MobileWorkflow::Engine => '/'"
       end
       
+      def copy_rake_tasks
+        copy_file("lib/tasks/mobile_workflow_doorkeeper.rake") if options[:doorkeeper_oauth]
+      end
+      
       def generate_doorkeeper
         return unless options[:doorkeeper_oauth]
         say "Generating Doorkeeper OAuth"
         
+        migration_template "create_users.rb", "db/migrate/create_users.rb"
+        
         generate 'doorkeeper:install'
         gsub_file 'config/initializers/doorkeeper.rb', 'raise "Please configure doorkeeper resource_owner_authenticator block located in #{__FILE__}"', 'User.find_by_id(session[:user_id]) || redirect_to(new_session_url(return_to: request.fullpath))'
         generate 'doorkeeper:migration'
@@ -36,6 +46,7 @@ module MobileWorkflow
         copy_file("app/views/layouts/application.html.erb")
         copy_file("app/views/sessions/new.html.erb")
         copy_file("app/helpers/application_helper.rb")
+        copy_file("spec/factories/users.rb")
       end
       
       def generate_models
@@ -73,7 +84,7 @@ module MobileWorkflow
             generate_model(controller_name, model_properties)
           end
           
-          generate "mobile_workflow:controller #{controller_name} --actions #{actions.join(" ")} --attributes #{model_properties} #{s3_storage? ? '--s3-storage' : ''}".strip
+          generate "mobile_workflow:controller #{controller_name} --actions #{actions.join(" ")} --attributes #{model_properties} #{generate_controller_args}".strip
           route "resources :#{plural_controller_name}, only: [#{actions.map{|a| ":#{a}"}.join(", ")}]"
         end
       end
@@ -88,6 +99,13 @@ module MobileWorkflow
         generate("mobile_workflow:model #{model_name} #{model_properties}")
       end
       
+      def generate_controller_args
+        args = ''
+        args += ' --s3-storage' if s3_storage?
+        args += ' --doorkeeper-oauth' if doorkeeper_oauth?
+        args.strip
+      end
+      
       def model_name_to_properties
         @model_name_to_properties ||= open_api_spec.model_name_to_properties
       end

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

@@ -45,6 +45,7 @@ group :development, :test do
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
   gem 'dotenv-rails'
   gem 'factory_bot_rails'
+  gem "rufo"
 end
 
 group :production do

data/lib/generators/mobile_workflow/install/templates/lib/tasks/mobile_workflow_doorkeeper.rake

@@ -0,0 +1,5 @@
+desc "Log the first Doorkeeper App details"
+task print_oauth_app: :environment do
+  puts Doorkeeper::Application.first.uid
+  puts Doorkeeper::Application.first.secret
+end

data/lib/generators/mobile_workflow/install/templates/spec/factories/users.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :user do
+    sequence(:email) { |n| "person#{n}@example.com" }
+    password { 'Password123' }
+  end
+end

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

@@ -20,7 +20,7 @@ class <%= controller_class_name %>Controller < ApiController
 <% if create_action? -%>
   def create
     <% if doorkeeper_oauth? -%>
-    @<%= singular_table_name %> = current_user
+    @<%= singular_table_name %>.user = current_user
     <% end -%>
     if @<%= singular_table_name %>.save
       <% if s3_storage? -%>
@@ -29,7 +29,7 @@ class <%= controller_class_name %>Controller < ApiController
       render json: { response: @<%= singular_table_name %> }, status: :created      
       <% end -%>
     else
-      head :unprocessable_entity 
+      render json: { message: @<%= singular_table_name %>.errors.full_messages.to_sentence }, status: :unprocessable_entity
     end
   end
 

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

@@ -8,7 +8,7 @@ RSpec.describe <%= controller_class_name %>Controller do
   let(:json_response) { JSON.parse(response.body, symbolize_names: true) }
   <% if doorkeeper_oauth? -%>
   let(:user) { create(:user) }
-  let(:token) { instance_double('Doorkeeper::AccessToken', :accessible? => true, :acceptable? => true, resource_owner_id: user.id) }
+  let(:token) { instance_double(Doorkeeper::AccessToken, accessible?: true, acceptable?: true, resource_owner_id: user.id) }
   <% end -%>
 
 <% if index_action? -%>  

data/lib/mobile_workflow/cli/app_builder.rb

@@ -18,13 +18,19 @@ module MobileWorkflow::Cli
     end
     
     def factory_bot
-      inject_into_file 'spec/rails_helper.rb', before: "end\n" do
-        "config.include FactoryBot::Syntax::Methods"
+      inject_into_file 'spec/rails_helper.rb', after: "RSpec.configure do |config|\n" do
+        "\tconfig.include FactoryBot::Syntax::Methods\n"
       end
     end
+    
+    def migrate_db 
+      rails_command("db:drop")
+      rails_command("db:create")
+      rails_command("db:migrate")
+    end
 
     def administrate_generator
-      Bundler.with_unbundled_env { generate 'administrate:install' }
+      generate 'administrate:install'
       
       file 'app/assets/config/manifest.js', <<-CODE
 //= link administrate/application.css
@@ -39,7 +45,7 @@ module Admin
 end
 CODE
 
-      Bundler.with_unbundled_env { generate 'administrate:routes' }
+      generate 'administrate:routes'
     end
     
     def ability_generator
@@ -57,9 +63,25 @@ CODE
       gen_opts = ""
       gen_opts += "--doorkeeper_oauth" if options[:doorkeeper_oauth]
       generate "mobile_workflow:install #{gen_opts}"
+    end
+    
+    def format_source
+      `rufo .`
+    end
+    
+    def generate_dot_env
+      admin_user = 'admin'
+      admin_password = SecureRandom.base64(12)
       
-      # Copy user migrations if needed
-      rails_command 'mobile_workflow:install:migrations' if options[:doorkeeper_oauth]
+      file '.env', <<-CODE
+ADMIN_USER=#{admin_user}
+ADMIN_PASSWORD=#{admin_password}
+CODE
+    end
+    
+    def git_commit(message = 'Initial commit')
+      git add: "."
+      git commit: %Q{ -m '#{message}'}
     end
     
     def s3_backend(region)

data/lib/mobile_workflow/cli/app_server_generator.rb

@@ -37,12 +37,11 @@ module MobileWorkflow::Cli
         build :ability_generator
         build :active_storage if options[:s3_storage] 
         build :mobile_workflow_generator, ARGV[1]
-        setup_db
+        build :migrate_db
         build :administrate_generator
-        
-        generate_dot_env
-        initial_git_commit
-        
+        build :format_source
+        build :generate_dot_env
+        build :git_commit
         build :heroku if options[:heroku]
         build :dokku, options[:dokku_host] if options[:dokku]
         build :s3_backend, options[:aws_region] if options[:s3_storage]
@@ -55,30 +54,5 @@ module MobileWorkflow::Cli
       ::MobileWorkflow::Cli::AppBuilder
     end
     
-    # Todo: MBS - move these methods to the builder class
-    # Ideally override RailsBuilder methods
-    private
-    def setup_db
-      Bundler.with_unbundled_env do 
-        rails_command("db:drop")
-        rails_command("db:create")
-        rails_command("db:migrate")
-      end
-    end
-
-    def initial_git_commit
-      git add: "."
-      git commit: %Q{ -m 'Initial commit' }
-    end
-
-    def generate_dot_env
-      admin_user = 'admin'
-      admin_password = SecureRandom.base64(12)
-      
-      file '.env', <<-CODE
-ADMIN_USER=#{admin_user}
-ADMIN_PASSWORD=#{admin_password}
-CODE
-    end
   end
 end

data/lib/mobile_workflow/cli/aws_backend.rb

@@ -5,7 +5,7 @@ module MobileWorkflow::Cli
   
     attr_accessor :access_id, :secret_key, :region, :bucket_name
   
-    def initialize(app_name:, region:)
+    def initialize(app_name:, region: 'us-east-1')
       @app_name = app_name
       @aws_name = @app_name.gsub("_", "-")
       @region = region

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.6.8'
+  VERSION = '0.6.13'
   RUBY_VERSION = '2.7.2'
   RAILS_VERSION = '6.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobile_workflow
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.13
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -103,7 +103,6 @@ files:
 - app/views/layouts/mobile_workflow/application.html.erb
 - bin/mwf
 - config/routes.rb
-- db/migrate/20200823174210_create_users.rb
 - lib/generators/mobile_workflow/controller_generator.rb
 - lib/generators/mobile_workflow/install/install_generator.rb
 - lib/generators/mobile_workflow/install/templates/Gemfile.erb
@@ -115,8 +114,11 @@ files:
 - lib/generators/mobile_workflow/install/templates/app/helpers/application_helper.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/create_users.rb
+- lib/generators/mobile_workflow/install/templates/lib/tasks/mobile_workflow_doorkeeper.rake
 - lib/generators/mobile_workflow/install/templates/seeds.rb.erb
 - lib/generators/mobile_workflow/install/templates/sessions_controller.rb.erb
+- lib/generators/mobile_workflow/install/templates/spec/factories/users.rb
 - lib/generators/mobile_workflow/install/templates/storage.s3.yml
 - lib/generators/mobile_workflow/install/templates/user.rb.erb
 - lib/generators/mobile_workflow/model_generator.rb