mobile_workflow 0.6.0 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74a57b5231432fa5532bc2757c6785604c833bf0b637770c15ea34faa41b3b13
-  data.tar.gz: 33a6f90850d5e6fb2522d76012336899b585ab1b8fd7db6dc768018c12eeca2b
+  metadata.gz: bceba9fe508e85d21cd026ac5b26d49f06cec0eb18127a250745d902268b761b
+  data.tar.gz: 311c915a764228757fe6f16bfbf382fb6710092a77ad075670de8b1a6548bf45
 SHA512:
-  metadata.gz: 54c3c9504079480aaba63c9974a17eb2c428254503568230ca058ad52a71119a0a6d469d30142cd7a41843b8757e4d24fcf94fccffeefe8fe06b5ab14e88b6a5
-  data.tar.gz: 62a5f5d474522fa2ade3fdccfb5a7f84b66f02d0c612a998cb235baee27e09cb33f0c12fc82019a010cfabd666fd614c5b98710d3a149914ac889048746cd2fe
+  metadata.gz: 0df8bee9d328897f6b8b92448d0b8df828896b386fd4494453589f21c8321f1db5aef0497396e9f4b0d10430e6f8be57815a16bc84e05a4fef1cdaf2a58d8e54
+  data.tar.gz: e7e5ce8cb555596c9c6f856ecee3b553dab36159951b3012a4a74646353b3ffbca5d32deb69501599fae14fd1ff0916ac2a71c4a9289185b9c044ab68cf40b05

data/lib/generators/mobile_workflow/controller_generator.rb

@@ -9,6 +9,7 @@ module MobileWorkflow
       class_option :attributes, type: :array, default: [], banner: "field:type field:type"
       class_option :actions, type: :array, default: [], banner: "index create update destroy"
       class_option :doorkeeper_oauth, type: :boolean, default: false
+      class_option :s3_storage, type: :boolean, default: false
       
       def copy_controller_and_spec_files
         template "controller.rb.erb", File.join("app/controllers", controller_class_path, "#{controller_file_name}_controller.rb")
@@ -20,6 +21,10 @@ module MobileWorkflow
         options[:doorkeeper_oauth]
       end
       
+      def s3_storage?
+        options[:s3_storage]
+      end
+      
       def attributes_names
         options[:attributes].map{ |attribute| attribute.split(":").first }
       end

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

@@ -9,6 +9,7 @@ module MobileWorkflow
 
       class_option :open_api_spec_path, type: :string, default: "config/open_api_spec.json"
       class_option :doorkeeper_oauth, type: :boolean, default: false
+      class_option :s3_storage, type: :boolean, default: false
       class_option :interactive, type: :boolean, default: false
 
       def create_api_controller
@@ -32,9 +33,9 @@ module MobileWorkflow
         route "resources :sessions, only: [:new, :create]"
         
         # View related for login screen
-        copy_file("views/layouts/application.html.erb")
-        copy_file("views/sessions/new.html.erb")
-        copy_file("helpers/application_helper.rb")
+        copy_file("app/views/layouts/application.html.erb")
+        copy_file("app/views/sessions/new.html.erb")
+        copy_file("app/helpers/application_helper.rb")
       end
       
       def generate_models
@@ -52,9 +53,10 @@ module MobileWorkflow
 
       def generate_controllers_and_routes
         say "Generating controllers"
-        route "root to: 'admin/#{open_api_spec.controller_names.first}#index'"
+        controller_name_to_actions = open_api_spec.controller_name_to_actions
+        route "root to: 'admin/#{controller_name_to_actions.keys.first}#index'"
         
-        open_api_spec.controller_names.each do |plural_controller_name|
+        controller_name_to_actions.each_pair do |plural_controller_name, actions|
           controller_name = plural_controller_name.singularize
           model_properties = model_name_to_properties[controller_name]
           
@@ -65,8 +67,8 @@ module MobileWorkflow
             generate_model(controller_name, model_properties)
           end
           
-          generate "mobile_workflow:controller #{controller_name} --attributes #{model_properties}"
-          route "resources :#{plural_controller_name}, only: [:index, :show, :create]"
+          generate "mobile_workflow:controller #{controller_name} #{actions.join(" ")} --attributes #{model_properties} #{s3_storage? ? '--s3-storage' : ''}".strip
+          route "resources :#{plural_controller_name}, only: [#{actions.map{|a| ":#{a}"}.join(", ")}]"
         end
       end
       
@@ -88,6 +90,10 @@ module MobileWorkflow
         @open_api_spec ||= ::MobileWorkflow::OpenApiSpec::Parser.new(File.read(open_api_spec_path))
       end
       
+      def s3_storage?
+        options[:s3_storage]
+      end
+      
       def open_api_spec_path
         options[:open_api_spec_path]
       end

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

@@ -1,6 +1,6 @@
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApiController
-  # include MobileWorkflow::S3Storable
+  <%= s3_storage? ? "include MobileWorkflow::S3Storable" : "" %>
   before_action :rewrite_payload, only: :create
 
   load_and_authorize_resource
@@ -15,7 +15,11 @@ class <%= controller_class_name %>Controller < ApiController
 
   def create
     if @<%= singular_table_name %>.save
+      <% if s3_storage? -%>
       render json: { binary_urls: binary_urls(@<%= singular_table_name %>), response: @<%= singular_table_name %> }, status: :created
+      <% else -%>
+      render json: { response: @<%= singular_table_name %> }, status: :created      
+      <% end -%>
     else
       head :unprocessable_entity 
     end

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

@@ -54,7 +54,9 @@ RSpec.describe <%= controller_class_name %>Controller do
     context 'ok' do
       it { expect(<%= controller_class_name.singularize %>.count).to eq 1 }          
       it { expect(response.status).to eq 201 }
+      <% if s3_storage? -%>
       it { expect(json_response[:binary_urls]).to_not be_nil }
+      <% end %>
     end
   end
 end

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

@@ -13,13 +13,13 @@ class <%= class_name %> < <%= parent_class_name.classify %>
 <% end -%>
 
   def list_item_as_json
-    mw_list_item(text: text)
+    mw_list_item(text: <%= attributes.first.name %>)
   end
   
   def display_as_json
     [
       mw_display_text(label: 'ID', text: id.to_s),
-      mw_display_text(label: 'Text', text: text)
+      mw_display_text(label: 'Text', text: <%= attributes.first.name %>)
     ]
   end
 

data/lib/mobile_workflow/cli/app_builder.rb

@@ -16,6 +16,12 @@ module MobileWorkflow::Cli
     def rspec_generator
       generate 'rspec:install'
     end
+    
+    def factory_bot
+      inject_into_file 'spec/rails_helper.rb', before: "end\n" do
+        "config.include FactoryBot::Syntax::Methods"
+      end
+    end
 
     def administrate_generator
       Bundler.with_unbundled_env { generate 'administrate:install' }

data/lib/mobile_workflow/cli/app_server_generator.rb

@@ -33,6 +33,7 @@ module MobileWorkflow::Cli
       after_bundle do
         build :procfiles
         build :rspec_generator
+        build :factory_bot
         build :ability_generator
         build :active_storage if options[:s3_storage] 
         build :mobile_workflow_generator, ARGV[1]

data/lib/mobile_workflow/open_api_spec/parser.rb

@@ -21,9 +21,9 @@ module MobileWorkflow
         end
         @model_properties
       end
-  
-      def controller_names
-        @controller_names ||= paths.collect{|url_path| url_path.split('/')[1] }.uniq
+      
+      def controller_name_to_actions
+        @controller_name_to_actions ||= parse_controller_names_to_actions
       end
   
       def paths
@@ -35,6 +35,22 @@ module MobileWorkflow
       end
   
       private
+      def parse_controller_names_to_actions
+        controllers = {}
+        paths.each do |path|
+          path_items = path.split('/')
+          controller_name = path_items[1]
+          controllers[controller_name] = [] unless controllers.key?(controller_name)
+          
+          open_api_spec[:paths][path].keys.each do |method|
+            controllers[controller_name] << 'create' if path_items.count == 2 && method == 'post'
+            controllers[controller_name] << 'index' if path_items.count == 2 && method == 'get'
+            controllers[controller_name] << 'show' if path_items.count == 3 && method == 'get'                        
+          end
+        end
+        controllers
+      end
+      
       def open_api_spec
         @open_api_spec ||= read_openapi_spec
       end

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.6.0'
+  VERSION = '0.6.6'
   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.0
+  version: 0.6.6
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-24 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,13 +112,13 @@ files:
 - 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/helpers/application_helper.rb
+- 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/seeds.rb.erb
 - lib/generators/mobile_workflow/install/templates/sessions_controller.rb.erb
 - lib/generators/mobile_workflow/install/templates/storage.s3.yml
 - lib/generators/mobile_workflow/install/templates/user.rb.erb
-- lib/generators/mobile_workflow/install/templates/views/layouts/application.html.erb
-- lib/generators/mobile_workflow/install/templates/views/sessions/new.html.erb
 - lib/generators/mobile_workflow/model_generator.rb
 - lib/generators/mobile_workflow/templates/controller.rb.erb
 - lib/generators/mobile_workflow/templates/controller_spec.rb.erb