mobile_workflow 0.5.6 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2a4d13fe23a8f256052b54fa14424c54d847bb327bf57128159b9dd8ffd334a
-  data.tar.gz: 0aa96388f99ac5f8ae69a1e6a06559c58c9eab58c355f877b259137472a3b176
+  metadata.gz: 24e4161405736a8da53f830ee7f46f84a58930a3f4d7e5fd28456005f4d1f99f
+  data.tar.gz: 9f13aa23db9a97150e0c0bd9c3a64b6b5161460df709c14a56a2af87ce3db784
 SHA512:
-  metadata.gz: 7f5890bf8381f177530fe3607e5ec4fe276258638f4a28213665c7c2dab5724ed14fb4a9f3ea3027581c41499c4fb995701e4b08138d0d31466f4781aa8f279e
-  data.tar.gz: 7b5c52f4a9b754078eb0c1a70b6213bf5b33f9825f1c67ce0325199b5c2bc1038cde0044b951baccdb6120c7fa2b46546349258c444cca4db7b438a96dbd5b3f
+  metadata.gz: 2e6056e6a06c99156d2106114ea885caedf5eb5ec83d62a02469aa645b7fb2498ab4ccf5fcc73bd1de5def857f64b8532fc65e669c870ed073d865e7c228d7e5
+  data.tar.gz: 8e6fc1fd000da48eddc130b84dec03ee8c1db5a0a1e95a5783d544a0fd720e364800b2c9b8cd769e222817a1304e4d32892664b61e159ae63c5520f1be132e71

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/layouts/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,23 +1,21 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.6.6'
+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'
 

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/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/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.5.6'
-  RUBY_VERSION = '2.5.5'
+  VERSION = '0.5.11'
+  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.6
+  version: 0.5.11
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-01-19 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
@@ -141,14 +144,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A Rails engine to provide API support for Mobile Workflow Apps.