mobile_workflow 0.5.3 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfdd780bae1700eef4c227697f5d75b953bfb70c4a553f2ac9dc3fa6b1a92d28
-  data.tar.gz: ad16f3eb17f23f6e92fea8c56d50d5deb06c2faa9b1ee62d5774ddb26f38c62f
+  metadata.gz: 713ccaaf463cd2815599e145de07b2b2cc5f838242f49e8e97a9eafebb691d10
+  data.tar.gz: f95cdbe9e1474adc2813c2c14edc113bd56b13bbb0661de16b2abe27368d1c30
 SHA512:
-  metadata.gz: d826dd850a09030b3f54666ffa37abb05fcdf39b0bc45e348d7988aebe03244a7bbddb38eea54a8ee482e4442256548d5fbd85d6c74d95dd365f2215b9930e0a
-  data.tar.gz: a8e597024e8ffa0eca83ec1958d6d90f02ff2e68722fd498bb8e96dcde216e46420f7f822e229507920f3d65ed291e7023c22dcefb484466309981a8de86d91a
+  metadata.gz: 936c2c40cf080691b9c867214d09dea90dd4a16f2370e6f2b7b0d307a965e78863dfb3a761839f8fc46463727e96a7d0e7f37e4767aade6132b202715faa6917
+  data.tar.gz: 126597e1a681f59d770b40c8c2c830398932b2d69c8b8d81c5e3a5fbd52e9e3f858d15e857b10ecede4c1caf2600090406cf2d0ea2212122c0fd705e19a6e7dd

data/app/controllers/mobile_workflow/sns_notifications_controller.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  class SnsNotificationsController < ApiController
+  class SnsNotificationsController < ActionController::API
     if Object.const_defined?("Aws::S3") && Object.const_defined?("Aws::SNS")
       before_action :verify_request_authenticity
  

data/app/models/concerns/mobile_workflow/displayable.rb

@@ -8,7 +8,7 @@ module MobileWorkflow
       
     def mw_list_item(id: self.id, text:, detail_text: nil, sf_symbol_name: nil, image_attachment: nil)
       mw_list_item = {id: id, text: text, detailText: detail_text, sfSymbolName: sf_symbol_name}
-      mw_list_item[:imageURL] = preview_url(image_attachment, height: 100, width: 100) if image_attachment
+      mw_list_item[:imageURL] = preview_url(image_attachment, options: { resize_to_fill: [100, 100] }) if image_attachment
       mw_list_item.compact   
     end
   
@@ -16,8 +16,8 @@ module MobileWorkflow
       {type: :text, label: label, text: text.to_s}.compact
     end
   
-    def mw_display_image(attachment)
-      {type: :image, previewURL: preview_url(attachment, height: 600, width: 1200), url: attachment_url(attachment)}
+    def mw_display_image(attachment, options: { resize_to_fill: [600, 1200] })
+      {type: :image, previewURL: preview_url(attachment, options: options), url: attachment_url(attachment)}
     end
     
     def mw_display_unsplash_image(image_url)
@@ -29,8 +29,8 @@ module MobileWorkflow
       {type: :image, previewURL: image_url, url: image_url}
     end
     
-    def mw_display_video(attachment)
-      {type: :video, previewURL: preview_url(attachment, height: 600, width: 1200), url: attachment_url(attachment)}
+    def mw_display_video(attachment, preview_options: { resize_to_fill: [600, 1200] })
+      {type: :video, previewURL: preview_url(attachment, options: preview_options), url: attachment_url(attachment)}
     end
   
     def mw_display_button(label:, style: :primary, on_success: :forward)
@@ -69,12 +69,12 @@ module MobileWorkflow
     def validate_button_style!(style)
       raise 'Unknown style' unless BUTTON_STYLES.include?(style)      
     end
-  
-    def preview_url(attachment, height:, width:, options: { resize_to_fill: [height, width]} )
+    
+    def preview_url(attachment, options:)
       return nil unless attachment.attached?
 
       if attachment.image?
-        Rails.application.routes.url_helpers.rails_representation_url(attachment.variant(combine_options: options), host: attachment_host)
+        Rails.application.routes.url_helpers.rails_representation_url(attachment.variant(options), host: attachment_host)
       elsif attachment.previewable?
         Rails.application.routes.url_helpers.rails_representation_url(attachment.preview(options), host: attachment_host)
       else

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

@@ -32,6 +32,11 @@ 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/layout/application.html.erb")
+        copy_file("views/sessions/new.html.erb")
+        copy_file("helpers/application_helper.rb")
       end
       
       def generate_models

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

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.6.6'
+ruby '2.7.2'
 
 # Core Gems
 gem 'rails', '~> 6.1.0'
@@ -11,12 +11,13 @@ gem 'turbolinks', '~> 5'
 
 # Mobile Workflow
 #gem 'mobile_workflow', path: '../mobile_workflow'
-gem 'mobile_workflow', github: 'FutureWorkshops/mobile_workflow'
+#gem 'mobile_workflow', github: 'FutureWorkshops/mobile_workflow'
+gem 'mobile_workflow'
 
 # Authorisation / Authentication
 <%- if options[:doorkeeper_oauth] %>
 gem 'doorkeeper'
-gem 'bcrypt-ruby'
+gem 'bcrypt'
 <%- end %>
 gem 'cancancan', '~> 3.1'
 

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/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/mobile_workflow/cli/app_builder.rb

@@ -18,9 +18,8 @@ module MobileWorkflow::Cli
     end
 
     def administrate_generator
-      Bundler.with_clean_env { generate 'administrate:install' }
+      Bundler.with_unbundled_env { generate 'administrate:install' }
       
-      #rails_command 'generate administrate:install'
       file 'app/assets/config/manifest.js', <<-CODE
 //= link administrate/application.css
 //= link administrate/application.js
@@ -34,7 +33,7 @@ module Admin
 end
 CODE
 
-      Bundler.with_clean_env { generate 'administrate:routes' }
+      Bundler.with_unbundled_env { generate 'administrate:routes' }
     end
     
     def ability_generator

data/lib/mobile_workflow/cli/app_server_generator.rb

@@ -51,16 +51,18 @@ module MobileWorkflow::Cli
     protected
 
     def get_builder_class
-      MobileWorkflow::Cli::AppBuilder
+      ::MobileWorkflow::Cli::AppBuilder
     end
     
     # Todo: MBS - move these methods to the builder class
     # Ideally override RailsBuilder methods
     private
     def setup_db
-      rails_command "db:drop"
-      rails_command "db:create"
-      rails_command "db:migrate"
+      Bundler.with_unbundled_env do 
+        rails_command("db:drop")
+        rails_command("db:create")
+        rails_command("db:migrate")
+      end
     end
 
     def initial_git_commit

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.5.3'
+  VERSION = '0.5.8'
   RUBY_VERSION = '2.5.5'
   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.3
+  version: 0.5.8
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,10 +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/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/templates/controller.rb.erb
 - lib/generators/mobile_workflow/templates/controller_spec.rb.erb
 - lib/mobile_workflow.rb