mobile_workflow 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bceba9fe508e85d21cd026ac5b26d49f06cec0eb18127a250745d902268b761b
-  data.tar.gz: 311c915a764228757fe6f16bfbf382fb6710092a77ad075670de8b1a6548bf45
+  metadata.gz: 61148da6dc89a23fb998f41ff2ff838c4bc0c9645e8f2b5b580d917ef170c470
+  data.tar.gz: 8c9c1b8d272e722ddf124aeecc4c9ce9bb63e8f44a7f8cc6422595cf65db34cc
 SHA512:
-  metadata.gz: 0df8bee9d328897f6b8b92448d0b8df828896b386fd4494453589f21c8321f1db5aef0497396e9f4b0d10430e6f8be57815a16bc84e05a4fef1cdaf2a58d8e54
-  data.tar.gz: e7e5ce8cb555596c9c6f856ecee3b553dab36159951b3012a4a74646353b3ffbca5d32deb69501599fae14fd1ff0916ac2a71c4a9289185b9c044ab68cf40b05
+  metadata.gz: 7b1a9c667c486a760b837f77ad15da942d0a098adb883357e69fdc9b2365772caeffe085622dfc0b0288368110e54b68e10b7efbb86ff877169e24d53b2b8955
+  data.tar.gz: 547f8800085d32cdaeda268e09a6448c3c460f8ef5ed488fde9f03d6df0da401b38cc0169b2759ab1dae1ea5bfc47a85539d36d7474c29975223d80cea0bd5bb

data/lib/generators/mobile_workflow/controller_generator.rb

@@ -33,6 +33,22 @@ module MobileWorkflow
         params = attributes_names.map{ |name| ":#{name}" }
         params.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
 end

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

@@ -41,13 +41,19 @@ module MobileWorkflow
       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:reference"
+            @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 +73,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} #{s3_storage? ? '--s3-storage' : ''}".strip
           route "resources :#{plural_controller_name}, only: [#{actions.map{|a| ":#{a}"}.join(", ")}]"
         end
       end
@@ -89,6 +95,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/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 %> = 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
@@ -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

@@ -82,6 +82,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/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.7'
   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.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Matt Brooke-Smith