mobile_workflow 0.5.7 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 843610afaa8207693d3f1be346698ca58e4022a3575b6953ef52c343781c649c
-  data.tar.gz: b787b24ab9fbf0f47910a889f23a59094d214db55c6eb0950609b674ba01ed64
+  metadata.gz: 74a57b5231432fa5532bc2757c6785604c833bf0b637770c15ea34faa41b3b13
+  data.tar.gz: 33a6f90850d5e6fb2522d76012336899b585ab1b8fd7db6dc768018c12eeca2b
 SHA512:
-  metadata.gz: 427d7c382ebc60cdf5ebd79f4257d2ec268cd0f52d7c7bd583afc1774c3adecaef910b163e06d1a754fa2340dfd352f23ae3c06056d97762e7b6fe878713b7cc
-  data.tar.gz: e98d3ebb68a12e42b3911d63fe16e4fe578ece0fc8e86814ac401d80a171fcd854d7a42f1a522fc535fc06d56eed1bb902e2a597b3d9d73a4c3c2b4603ce59a7
+  metadata.gz: 54c3c9504079480aaba63c9974a17eb2c428254503568230ca058ad52a71119a0a6d469d30142cd7a41843b8757e4d24fcf94fccffeefe8fe06b5ab14e88b6a5
+  data.tar.gz: 62a5f5d474522fa2ade3fdccfb5a7f84b66f02d0c612a998cb235baee27e09cb33f0c12fc82019a010cfabd666fd614c5b98710d3a149914ac889048746cd2fe

data/lib/generators/mobile_workflow/controller_generator.rb

@@ -8,13 +8,18 @@ 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
       
       def copy_controller_and_spec_files
         template "controller.rb.erb", File.join("app/controllers", controller_class_path, "#{controller_file_name}_controller.rb")
         template "controller_spec.rb.erb", File.join("spec/controllers", controller_class_path, "#{controller_file_name}_controller_spec.rb")
       end
       
-      private  
+      private
+      def doorkeeper_oauth?
+        options[:doorkeeper_oauth]
+      end
+      
       def attributes_names
         options[:attributes].map{ |attribute| attribute.split(":").first }
       end

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

@@ -1,12 +1,10 @@
 require "rails/generators/base"
+require "mobile_workflow/open_api_spec/parser"
 
 module MobileWorkflow
   module Generators
     class InstallGenerator < Rails::Generators::Base
       
-      # Schemas to avoid generating models for (static items from MW)
-      SKIP_SCHEMAS = ["attachment", "ListItem", "DisplayItem", "DisplayText", "DisplayButton", "DisplayImage", "DisplayVideo"]
-      
       source_root File.expand_path("../templates", __FILE__)
 
       class_option :open_api_spec_path, type: :string, default: "config/open_api_spec.json"
@@ -32,28 +30,41 @@ module MobileWorkflow
         template("user.rb.erb", "app/models/user.rb")
         template("sessions_controller.rb.erb", "app/controllers/sessions_controller.rb")
         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")
       end
       
       def generate_models
+        say "Loading OpenAPI Spec: #{open_api_spec_path}"
         say "Generating models"
-        @model_properties = {}
-        open_api_spec[:components][:schemas].each_pair do |model_name, schema|
-          next if SKIP_SCHEMAS.include? model_name # Don't generate schemas for MW schemas
-        
-          model_name = model_name.underscore
-          model_properties = model_properties(model_name, schema)
-          generate(:model, "#{model_name} #{model_properties}")
-          @model_properties[model_name] = model_properties
+        model_name_to_properties.each_pair do |model_name, model_properties|          
+          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)"
+          end
+
+          generate_model(model_name, model_properties)
+          @model_name_to_properties[model_name] = model_properties
         end
       end
 
       def generate_controllers_and_routes
         say "Generating controllers"
-        route "root to: 'admin/#{controller_names.first}#index'"
+        route "root to: 'admin/#{open_api_spec.controller_names.first}#index'"
         
-        controller_names.each do |plural_controller_name|
+        open_api_spec.controller_names.each do |plural_controller_name|
           controller_name = plural_controller_name.singularize
-          model_properties = @model_properties[controller_name]
+          model_properties = model_name_to_properties[controller_name]
+          
+          unless model_properties
+            # Generate a model because it probably wasnt present in the schema
+            # And set default attributes
+            model_properties = "text:string"
+            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]"
         end
@@ -64,21 +75,17 @@ module MobileWorkflow
       end
 
       private
-      def controller_names
-        @controller_names ||= oai_spec_paths.collect{|url_path| url_path.split('/')[1] }.uniq
-      end
       
-      def oai_spec_paths
-        @oai_spec_paths ||= open_api_spec[:paths].keys
+      def generate_model(model_name, model_properties)
+        generate("mobile_workflow:model #{model_name} #{model_properties}")
       end
       
-      def open_api_spec
-        @open_api_spec ||= read_openapi_spec
+      def model_name_to_properties
+        @model_name_to_properties ||= open_api_spec.model_name_to_properties
       end
       
-      def read_openapi_spec
-        say "Loading OpenAPI Spec: #{open_api_spec_path}" 
-        return JSON.parse(File.read(open_api_spec_path)).with_indifferent_access 
+      def open_api_spec
+        @open_api_spec ||= ::MobileWorkflow::OpenApiSpec::Parser.new(File.read(open_api_spec_path))
       end
       
       def open_api_spec_path
@@ -88,22 +95,6 @@ module MobileWorkflow
       def interactive?
         options[:interactive]
       end
-      
-      def model_properties(name, schema)
-        generated_properties_args = schema["properties"].keys.collect{|key| "#{key}:#{model_property_type(schema["properties"][key])}" }.join(" ")
-        if !interactive? || yes?("Use generated schema #{name}(#{generated_properties_args})[yn]?")
-          generated_properties_args
-        else
-          ask "Specify schema for #{name}: (e.g. text:string image:attachment region:reference)"
-        end      
-      end
-      
-      def model_property_type(property)
-        return property["type"] unless property["type"].blank?
-        return 'attachment' if property['$ref'] == "#/components/schemas/attachment"
-        
-        raise 'Unknown property type'
-      end
     end
   end
 end

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

@@ -1,23 +1,21 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.2'
+ruby '<%= MobileWorkflow::RUBY_VERSION %>'
 
 # Core Gems
-gem 'rails', '~> 6.1.0'
+gem 'rails', '~> <%= MobileWorkflow::RAILS_VERSION %>'
 gem 'puma', '~> 5.0'
 gem 'sass-rails', '>= 6'
 gem 'turbolinks', '~> 5'
 
 # Mobile Workflow
-#gem 'mobile_workflow', path: '../mobile_workflow'
-#gem 'mobile_workflow', github: 'FutureWorkshops/mobile_workflow'
-gem 'mobile_workflow', '0.5.5'
+gem 'mobile_workflow', '~> <%= MobileWorkflow::VERSION %>'
 
 # Authorisation / Authentication
 <%- if options[:doorkeeper_oauth] %>
 gem 'doorkeeper'
-gem 'bcrypt-ruby'
+gem 'bcrypt'
 <%- end %>
 gem 'cancancan', '~> 3.1'
 
@@ -33,6 +31,9 @@ gem 'aws-sdk-s3', '~> 1.60', '>= 1.60.1'
 gem 'aws-sdk-sns', '~> 1.23'
 <%- end %>
 
+# FFI for Mac M1
+gem 'ffi', github: 'ffi/ffi'
+
 group :development do
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'

data/lib/generators/mobile_workflow/install/templates/api_controller.rb.erb

@@ -8,7 +8,7 @@ class ApiController < ActionController::API
   before_action :doorkeeper_authorize!, unless: :anonymous_action?
   
   def current_resource_owner
-    User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token&.accessible?
+    @current_resource_owner ||= User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token&.accessible?
   end
   alias_method :current_user, :current_resource_owner
   

data/lib/generators/mobile_workflow/install/templates/helpers/application_helper.rb

@@ -0,0 +1,13 @@
+module ApplicationHelper
+  
+  def bootstrap_class_for(flash_type)
+    { success: "alert-success", error: "alert-danger", alert: "alert-warning", notice: "alert-info" }.stringify_keys[flash_type.to_s] || flash_type.to_s
+  end
+  
+  def flash_messages
+    flash.each do |flash_type, message|
+      concat(content_tag(:div, message, class: "alert #{bootstrap_class_for(flash_type)}", role: 'alert'))
+    end
+    nil
+  end
+end

data/lib/generators/mobile_workflow/install/templates/sessions_controller.rb.erb

@@ -3,7 +3,7 @@ class SessionsController < ApplicationController
   end
 
   def create
-    @user = User.find_by(email: params[:email])
+    @user = User.find_by("LOWER(email)= ?", params[:email].downcase)
     if @user && @user.authenticate(params[:password])
       session[:user_id] = @user.id
       redirect_to params[:return_to] || root_url, notice: "Logged in!"

data/lib/generators/mobile_workflow/install/templates/user.rb.erb

@@ -1,4 +1,4 @@
 class User < ApplicationRecord
   has_secure_password
-  validates :email, presence: true
+  validates :email, presence: true, uniqueness: true
 end

data/lib/generators/mobile_workflow/install/templates/views/layouts/application.html.erb

@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+    <!-- Bootstrap CSS -->
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
+
+    <title>MW Project</title>
+  </head>
+  <body>
+    <div class="container">
+      <%= yield %>
+    </div>
+  </body>
+</html>

data/lib/generators/mobile_workflow/install/templates/views/sessions/new.html.erb

@@ -0,0 +1,20 @@
+<h1>Sign In</h1>
+
+<%= flash_messages %>
+
+<%= form_tag sessions_path, method: :post do %>
+  <%= hidden_field_tag :return_to, params[:return_to] %>
+  
+  <div class="form-group">
+    <%= label_tag :email %>
+    <%= email_field_tag :email, nil, class: "form-control" %>
+  </div>
+
+  <div class="form-group">
+    <%= label_tag :password %>
+    <%= password_field_tag :password, nil, class: "form-control" %>
+  </div>
+
+  <%= submit_tag 'Sign In', class: "btn btn-primary" %>
+<% end %>
+

data/lib/generators/mobile_workflow/model_generator.rb

@@ -0,0 +1,15 @@
+require 'rails/generators/active_record/model/model_generator'
+
+module MobileWorkflow
+  module Generators
+
+    class ModelGenerator < ActiveRecord::Generators::ModelGenerator
+      source_root File.join(File.dirname(ActiveRecord::Generators::ModelGenerator.instance_method(:create_migration_file).source_location.first), "templates")
+      
+      def create_model_file
+        template File.join(File.dirname(__FILE__), "templates", "model.rb.erb"), File.join('app/models', class_path, "#{file_name}.rb")
+      end
+      
+    end
+  end
+end

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

@@ -6,10 +6,19 @@ require 'json'
 RSpec.describe <%= controller_class_name %>Controller do
   let(:params) { {} }
   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) }
+  <% end -%>
   
   describe 'GET #index' do
     let!(:<%= controller_class_name.singularize.underscore %>) { create(:<%= controller_class_name.singularize.underscore %>) }
-    before(:each) { get :index, params: params }
+    before(:each) do
+      <% if doorkeeper_oauth? -%>
+      allow(subject).to receive(:doorkeeper_token) { token }
+      <% end -%>
+	    get :index, params: params
+	  end
     
     context 'ok' do
       it { expect(json_response[0][:id]).to eq <%= controller_class_name.singularize.underscore %>.id }               
@@ -20,7 +29,12 @@ RSpec.describe <%= controller_class_name %>Controller do
   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 } }
-    before(:each) { get :show, params: params }
+    before(:each) do
+      <% if doorkeeper_oauth? -%>
+      allow(subject).to receive(:doorkeeper_token) { token }
+      <% end -%>
+	    get :show, params: params
+	  end
     
     context 'ok' do                
       it { expect(response.status).to eq 200 }
@@ -30,7 +44,12 @@ RSpec.describe <%= controller_class_name %>Controller do
   describe 'POST #create' do
     let(:payload_params) { {text: 'OK'} }
     let(:params) { { payload: payload_params, binaries: [{identifier: 'record', mimetype: 'video/mp4'}] } }
-    before(:each) { post :create, params: params }
+    before(:each) do
+      <% if doorkeeper_oauth? -%>
+      allow(subject).to receive(:doorkeeper_token) { token }
+      <% end -%>
+	    post :create, params: params
+	  end
     
     context 'ok' do
       it { expect(<%= controller_class_name.singularize %>.count).to eq 1 }          

data/lib/{templates/active_record/model → generators/mobile_workflow/templates}/model.rb.erb

@@ -17,7 +17,10 @@ class <%= class_name %> < <%= parent_class_name.classify %>
   end
   
   def display_as_json
-    [mw_display_text(label: 'ID', text: id.to_s)]
+    [
+      mw_display_text(label: 'ID', text: id.to_s),
+      mw_display_text(label: 'Text', text: text)
+    ]
   end
 
 end

data/lib/mobile_workflow/cli/aws_backend.rb

@@ -53,9 +53,9 @@ module MobileWorkflow::Cli
     def destroy
       aws_command "aws s3api delete-bucket --bucket #{@aws_name} --region #{@region}"
     
-      aws_command("aws sns list-topics")["Topics"].each do |topic|
+      aws_command("aws sns list-topics --region #{@region}")["Topics"].each do |topic|
         topic_arn = topic["TopicArn"]
-        aws_command "aws sns delete-topic --topic-arn '#{topic_arn}'" if topic_arn.end_with?(@aws_name)
+        aws_command "aws sns delete-topic --topic-arn '#{topic_arn}' --region #{@region}" if topic_arn.end_with?(@aws_name)
       end
     
       aws_command "aws iam delete-user-policy --user-name #{@aws_name} --policy-name s3"

data/lib/mobile_workflow/open_api_spec/parser.rb

@@ -0,0 +1,59 @@
+module MobileWorkflow
+  module OpenApiSpec
+    class Parser
+  
+      # Schemas to avoid generating models for (static items from MW)
+      SKIP_SCHEMAS = ["attachment", "ListItem", "DisplayItem", "DisplayText", "DisplayButton", "DisplayImage", "DisplayVideo"]
+  
+      def initialize(open_api_spec_string)
+        @open_api_spec_string = open_api_spec_string
+      end
+  
+      def model_name_to_properties
+        @model_properties = {}
+        schemas.each_pair do |model_name, schema|
+          next if SKIP_SCHEMAS.include? model_name # Don't generate schemas for MW schemas
+    
+          model_name = model_name.underscore
+          model_properties = schema_model_properties(model_name, schema)
+      
+          @model_properties[model_name] = model_properties
+        end
+        @model_properties
+      end
+  
+      def controller_names
+        @controller_names ||= paths.collect{|url_path| url_path.split('/')[1] }.uniq
+      end
+  
+      def paths
+        @paths ||= open_api_spec[:paths].keys
+      end
+  
+      def schemas
+        @schemas ||= open_api_spec[:components][:schemas]
+      end
+  
+      private
+      def open_api_spec
+        @open_api_spec ||= read_openapi_spec
+      end
+  
+      def schema_model_properties(name, schema)
+        schema["properties"].keys.collect{|key| "#{key}:#{model_property_type(schema["properties"][key])}" }.join(" ")  
+      end
+  
+      def model_property_type(property)
+        return property["type"] unless property["type"].blank?
+        return 'attachment' if property['$ref'] == "#/components/schemas/attachment"
+    
+        raise 'Unknown property type'
+      end
+  
+      def read_openapi_spec
+        @read_openapi_spec ||= JSON.parse(@open_api_spec_string).with_indifferent_access 
+      end
+  
+    end
+  end
+end

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.5.7'
-  RUBY_VERSION = '2.5.5'
+  VERSION = '0.6.0'
+  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.5.7
+  version: 0.6.0
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-02 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,12 +112,17 @@ 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/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
+- lib/generators/mobile_workflow/templates/model.rb.erb
 - lib/mobile_workflow.rb
 - lib/mobile_workflow/cli.rb
 - lib/mobile_workflow/cli/app_builder.rb
@@ -127,8 +132,8 @@ files:
 - lib/mobile_workflow/cli/dokku_backend.rb
 - lib/mobile_workflow/cli/heroku_backend.rb
 - lib/mobile_workflow/engine.rb
+- lib/mobile_workflow/open_api_spec/parser.rb
 - lib/mobile_workflow/version.rb
-- lib/templates/active_record/model/model.rb.erb
 homepage: https://github.com/futureworkshops/mobile_workflow
 licenses:
 - MIT
@@ -141,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.5
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="