mobile_workflow 0.6.6 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bceba9fe508e85d21cd026ac5b26d49f06cec0eb18127a250745d902268b761b
-  data.tar.gz: 311c915a764228757fe6f16bfbf382fb6710092a77ad075670de8b1a6548bf45
+  metadata.gz: 1e3e8921b520d2c949e637961bbeb4d13fa324214a4887efe11e235ab820ae51
+  data.tar.gz: ddc4c8b0334ab28a4f04151a8ede868719eb7ecaab56926ed76cc0e087a132fe
 SHA512:
-  metadata.gz: 0df8bee9d328897f6b8b92448d0b8df828896b386fd4494453589f21c8321f1db5aef0497396e9f4b0d10430e6f8be57815a16bc84e05a4fef1cdaf2a58d8e54
-  data.tar.gz: e7e5ce8cb555596c9c6f856ecee3b553dab36159951b3012a4a74646353b3ffbca5d32deb69501599fae14fd1ff0916ac2a71c4a9289185b9c044ab68cf40b05
+  metadata.gz: c660ac1590e0d250eeae44209f57c53054411b5d470886cb9317793b059bf5d5d038b3f945e22032e1e3ce83b116885608bf172f7b84ad156795f614e186bd28
+  data.tar.gz: f8a008f70970aa378518f93824c8312780098d7983a8e53203ea17730c4b48c7389f5a5b3b8d3cac8c389d46a0ddf50e6f6dc945fbc1276e42bd03bbd3a7e20d

data/lib/generators/mobile_workflow/controller_generator.rb

@@ -30,8 +30,25 @@ 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?
+        actions.include?("index")
+      end
+      
+      def show_action?
+        actions.include?("show")
+      end
+      
+      def create_action?
+        actions.include?("create")
+      end
+      
+      def actions
+        options[:actions]
       end
     end
   end

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__)
 
@@ -24,6 +28,8 @@ module MobileWorkflow
         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,18 +42,25 @@ 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
         say "Loading OpenAPI Spec: #{open_api_spec_path}"
         say "Generating models"
-        model_name_to_properties.each_pair do |model_name, model_properties|          
+        model_name_to_properties.each_pair do |model_name, model_properties|   
+          
+          if doorkeeper_oauth?
+            model_properties = "#{model_properties} user:references"
+            @model_name_to_properties[model_name] = model_properties
+          end
+                 
           if interactive? && !yes?("Use generated schema #{model_name}(#{model_properties})[yn]?")
             model_properties = ask "Specify schema for #{model_name}: (e.g. text:string image:attachment region:reference)"
+            @model_name_to_properties[model_name] = model_properties
           end
 
           generate_model(model_name, model_properties)
-          @model_name_to_properties[model_name] = model_properties
         end
       end
 
@@ -67,7 +80,7 @@ module MobileWorkflow
             generate_model(controller_name, model_properties)
           end
           
-          generate "mobile_workflow:controller #{controller_name} #{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
@@ -82,6 +95,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
@@ -89,6 +109,10 @@ module MobileWorkflow
       def open_api_spec
         @open_api_spec ||= ::MobileWorkflow::OpenApiSpec::Parser.new(File.read(open_api_spec_path))
       end
+
+      def doorkeeper_oauth?
+        options[:doorkeeper_oauth]
+      end
       
       def s3_storage?
         options[:s3_storage]

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/spec/factories/users.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :user do
+    email { 'jo@example.com' }
+    password { 'Password123' }
+  end
+end

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

@@ -4,16 +4,24 @@ 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? -%>
+    @<%= singular_table_name %>.user = current_user
+    <% end -%>
     if @<%= singular_table_name %>.save
       <% if s3_storage? -%>
       render json: { binary_urls: binary_urls(@<%= singular_table_name %>), response: @<%= singular_table_name %> }, status: :created
@@ -21,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
 
@@ -39,5 +47,6 @@ class <%= controller_class_name %>Controller < ApiController
   def <%= singular_table_name.underscore %>_params
     params.require(:payload).permit(<%= permitted_params %>)
   end
+<% end -%>
 end
 <% end %>

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

@@ -10,7 +10,8 @@ RSpec.describe <%= controller_class_name %>Controller do
   let(:user) { create(:user) }
   let(:token) { instance_double('Doorkeeper::AccessToken', :accessible? => true, :acceptable? => true, resource_owner_id: user.id) }
   <% end -%>
-  
+
+<% if index_action? -%>  
   describe 'GET #index' do
     let!(:<%= controller_class_name.singularize.underscore %>) { create(:<%= controller_class_name.singularize.underscore %>) }
     before(:each) do
@@ -25,7 +26,8 @@ RSpec.describe <%= controller_class_name %>Controller do
       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 } }
@@ -40,7 +42,9 @@ RSpec.describe <%= controller_class_name %>Controller do
       it { expect(response.status).to eq 200 }
     end
   end
-  
+
+<% end -%>
+<% if create_action? -%>
   describe 'POST #create' do
     let(:payload_params) { {text: 'OK'} }
     let(:params) { { payload: payload_params, binaries: [{identifier: 'record', mimetype: 'video/mp4'}] } }
@@ -59,4 +63,5 @@ RSpec.describe <%= controller_class_name %>Controller do
       <% end %>
     end
   end
+<% end -%>
 end

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)
@@ -82,6 +104,7 @@ CODE
       heroku_backend.create
       heroku_backend.configure_activestorage if options[:s3_storage]
       heroku_backend.deploy
+      heroku_backend.seed_db
       heroku_backend.sync_dotenv
     end
     

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/heroku_backend.rb

@@ -21,6 +21,10 @@ module MobileWorkflow::Cli
     def deploy
       heroku_command "git push"
     end
+    
+    def seed_db
+      heroku_command "heroku run rails db:seed"
+    end
   
     def sync_dotenv
       env = File.read(".env").split.join(" ")

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.6.6'
+  VERSION = '0.6.11'
   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.6
+  version: 0.6.11
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-02-16 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,10 @@ 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/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