mobile_workflow 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 913509d1248a7a63226904e313ba1e56c700df9b95f0e393bb642d8f512c94b5
-  data.tar.gz: f1718f9a7e22d33c90ff546215c3ed6047118fca4148ccff6344ec34bedb375c
+  metadata.gz: c1e72adcc8d3a21ec01476098c7f16fe849c2ab8348f0164fe15ffde1872b156
+  data.tar.gz: 5c361e5591040d4a5636aa425dbf77ec533cddbad38e150a6f1f94a1fdca360e
 SHA512:
-  metadata.gz: 2bc79973227c2db3e308c4329076ea441364ed7c65f2b095fabb201e23fedd2d736883c872ed051aa0ee17e2a94e626f4a99c3dbb95a058d8dbf568dc9d25a05
-  data.tar.gz: 5689ffc81f5df062ac81e25fdbe04da2986c10e434ba5bc9ce27d502381a3fbc63da5c8d8ffa698e4d85571b56ea3b74a0e26936c9178874dd66e60b773aa50a
+  metadata.gz: 5b66dbaa49b726bc92618c6405af04e3cac7476809ffafeda4d7d444ec3275a993fae2c4a4b6c534ecd5569467c3c8fb4402c97a7b96d1238d1f0c5c34190148
+  data.tar.gz: 67bd8a5575e05e1ec46653b42eadf089a81c05e64ea0c1e6f9702b6e0621e9fd6212e577f13ccbf085a299f53fd1bf288df2db01fd46b2b52d9a748f07aa0518

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

@@ -42,6 +42,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
@@ -79,7 +80,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
@@ -94,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

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

@@ -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? -%>

data/lib/mobile_workflow/cli/app_builder.rb

@@ -18,8 +18,8 @@ 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
     
@@ -65,6 +65,10 @@ CODE
       generate "mobile_workflow:install #{gen_opts}"
     end
     
+    def format_source
+      run 'rufo .'
+    end
+    
     def s3_backend(region)
       @region = region
       aws_backend.create

data/lib/mobile_workflow/cli/app_server_generator.rb

@@ -39,6 +39,7 @@ module MobileWorkflow::Cli
         build :mobile_workflow_generator, ARGV[1]
         build :migrate_db
         build :administrate_generator
+        build :format_source
         
         generate_dot_env
         initial_git_commit

data/lib/mobile_workflow/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile_workflow
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Matt Brooke-Smith
@@ -117,6 +117,7 @@ files:
 - 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