mobile_workflow 0.6.27 → 0.6.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f9084def0ec77b8ee7203822dd7236004818b1baa9b9bed967ac1788ab9a0f4
-  data.tar.gz: 975a6a50f67d3803def2b1292cc45bada6e48e91dc0f4bd1955cf3beaba9ff8f
+  metadata.gz: 37eb1d708549f31b01aca9e6cb6c68b2e0778f647c326c6f2ed54e55f64c58c0
+  data.tar.gz: 5b23a0cd92a3b8c3a9931651c9eb37322fdd693f44700aac1da684764fc8b5ef
 SHA512:
-  metadata.gz: 5a1a5570d254f1ed00165ce6cf76a5579788a9a18780cd5c5d3063244072aefb6b5d6133f19294428e2ea655c73a5c47737c8a031776a9a82561675356ea6386
-  data.tar.gz: ee6e9a984dffaa11c24aa53236df91cb38b7cbf3319f69c438a782bb4a599ee818bcabf699e1fda5af3a43774963f0f24607f6781cd41527ce7558704dacbe00
+  metadata.gz: 1c345303b25a33807e58ca50e4ea1cea90853c896361f90b492f80d55306e45552fea574a28b0e548f1318e225519e478d3bb102e8a5f36d06ee773750aacded
+  data.tar.gz: 232110a1e208baddf77c246e4d7727cb6fb4f21ae06689e54a2e43be2db2fab0b3e48a99a25bf64a9759e1b904584b707d6bf2e0c134da616459dee6b8c0e3b6

data/README.md

@@ -4,6 +4,11 @@ Short description and motivation.
 ## Usage
 How to use my plugin.
 
+## Uploads Design
+This gem includes an engine to add and process S3 attachments. The design is as follows:
+
+![Uploads Design](https://github.com/FutureWorkshops/mobile_workflow/blob/master/uploads_design.png?raw=true)
+
 ## Installation
 Add this line to your application's Gemfile:
 

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

@@ -8,18 +8,18 @@ module MobileWorkflow
     CONTENT_MODE_OPTIONS = [:scale_aspect_fill, :scale_aspect_fit] 
     QUESTION_STYLES = [:single_choice, :multiple_choice] 
     
-    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, options: { resize_to_fill: [100, 100] }) if image_attachment
+    def mw_list_item(id: self.id, text:, detail_text: nil, sf_symbol_name: nil, material_icon_name: nil, image_attachment: nil)
+      mw_list_item = {id: id, text: text, detailText: detail_text, sfSymbolName: sf_symbol_name, materialIconName: material_icon_name}
+      mw_list_item[:imageURL] = preview_url(image_attachment, options: { resize_to_fill: [200, 200] }) if image_attachment
       mw_list_item.compact
     end
     
-    def mw_list_search_suggestion(id:, text:, section_name:, sf_symbol_name: nil)
-      {id: id, text: text, sectionName: section_name, sfSymbolName: sf_symbol_name}.compact
+    def mw_list_search_suggestion(id: self.id, text:, section_name:, sf_symbol_name: nil)
+      {id: id.to_s, text: text, sectionName: section_name, sfSymbolName: sf_symbol_name}.compact
     end
     
     def mw_map_item(id: self.id, text:, detail_text: nil, latitude:, longitude:)
-      {id: id, text: text, detailText: detail_text, latitude: latitude, longitude: longitude}.compact
+      {id: id.to_s, text: text, detailText: detail_text, latitude: latitude, longitude: longitude}.compact
     end
     
     def mw_pie_chart_item(id: self.id, label:, value:)
@@ -30,7 +30,7 @@ module MobileWorkflow
       {type: :text, label: label, text: text.to_s}.compact
     end
   
-    def mw_display_image(attachment, content_mode: :scale_aspect_fill, options: { resize_to_fill: [600, 1200] })
+    def mw_display_image(attachment, content_mode: :scale_aspect_fill, options: { resize_to_fill: [1200, 600] })
       validate_content_mode!(content_mode)
       
       {type: :image, contentMode: content_mode.to_s.camelize(:lower), previewURL: preview_url(attachment, options: options), url: attachment_url(attachment)}
@@ -73,7 +73,7 @@ module MobileWorkflow
     
     def mw_display_system_url_button(label:, apple_system_url: nil, android_deep_link: nil, style: :primary, sf_symbol_name: nil, material_icon_name: nil)
       validate_button_style!(style)
-      raise 'Invalid android_deep_link' unless android_deep_link.start_with?('http')
+      raise 'Invalid android_deep_link' if android_deep_link && !android_deep_link.start_with?('http')
       
       {type: :button, label: label, appleSystemURL: apple_system_url, androidDeepLink: android_deep_link, style: style, sfSymbolName: sf_symbol_name, materialIconName: material_icon_name}.compact
     end
@@ -110,12 +110,12 @@ module MobileWorkflow
       { id: id, text: text, type: :smallSection }
     end
     
-    def mw_grid_item(id: self.id, text:, image_attachment: nil)
+    def mw_grid_item(id: self.id, text:, image_attachment: nil, options: { resize_to_fill: [1560, 877.5] })
       raise 'Missing id' if id.nil?
       raise 'Missing text' if text.nil?
       
       item = { id: id, text: text, type: :item }
-      item[:imageURL] = preview_url(image_attachment, options: { resize_to_fill: [1224, 760] }) if image_attachment
+      item[:imageURL] = preview_url(image_attachment, options: options) if image_attachment
       item
     end
   
@@ -155,7 +155,7 @@ module MobileWorkflow
     end
 
     def attachment_host
-      "https://#{ENV['HEROKU_APP_NAME']}.herokuapp.com"
+      "https://#{ENV.fetch('HEROKU_APP_NAME')}.herokuapp.com"
     end
   end
 end

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

@@ -35,7 +35,7 @@ module MobileWorkflow
         migration_template "create_users.rb", "db/migrate/create_users.rb"
         
         generate 'doorkeeper:install'
-        gsub_file 'config/initializers/doorkeeper.rb', 'raise "Please configure doorkeeper resource_owner_authenticator block located in #{__FILE__}"', 'User.find_by_id(session[:user_id]) || redirect_to(new_session_url(return_to: request.fullpath))'
+        gsub_file 'config/initializers/doorkeeper.rb', 'raise "Please configure doorkeeper resource_owner_authenticator block located in #{__FILE__}"', 'User.find_by_id(session.delete(:user_id)) || redirect_to(new_session_url(return_to: request.fullpath))'
         generate 'doorkeeper:migration'
         generate 'doorkeeper:pkce'
         template("user.rb.erb", "app/models/user.rb")

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

@@ -4,13 +4,13 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '<%= MobileWorkflow::RUBY_VERSION %>'
 
 # Core Gems
-gem 'rails', '~> <%= MobileWorkflow::RAILS_VERSION %>'
+gem 'rails', '<%= MobileWorkflow::RAILS_VERSION %>'
 gem 'puma', '~> 5.0'
 gem 'sass-rails', '>= 6'
 gem 'turbolinks', '~> 5'
 
 # Mobile Workflow
-gem 'mobile_workflow', '~> <%= MobileWorkflow::VERSION %>'
+gem 'mobile_workflow', '<%= MobileWorkflow::VERSION %>'
 
 # Authorisation / Authentication
 <%- if options[:doorkeeper_oauth] %>
@@ -32,7 +32,7 @@ gem 'aws-sdk-sns', '~> 1.23'
 <%- end %>
 
 # FFI for Mac M1
-gem 'ffi', github: 'ffi/ffi'
+gem 'ffi', '~> 1.15.1'
 
 group :development do
   gem 'web-console', '>= 3.3.0'

data/lib/generators/mobile_workflow/install/templates/Procfile.dev

@@ -1 +1 @@
-web: bundle exec rackup config.ru -p $PORT
+web: bin/rails s -p $PORT

data/lib/generators/mobile_workflow/install/templates/lib/tasks/mobile_workflow_s3.rake

@@ -1,9 +1,10 @@
-desc "Add S3 storage to your environment"
+desc "Add S3 storage to a Heroku app"
 task add_heroku_s3_storage: :environment do
   require 'mobile_workflow/cli'
   app_name = ENV['APP_NAME']
-  aws = MobileWorkflow::Cli::AwsBackend.new(app_name: app_name)
-  heroku = MobileWorkflow::Cli::HerokuBackend(app_name: app_name)
+  aws_region = ENV['AWS_REGION'] || 'us-east-1'
+  aws = MobileWorkflow::Cli::AwsBackend.new(app_name: app_name, region: aws_region)
+  heroku = MobileWorkflow::Cli::HerokuBackend.new(app_name: app_name)
   aws.create
   aws.create_topic_subscription(heroku.notifications_endpoint)
 end

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

@@ -1,3 +1,4 @@
 <%- if options[:doorkeeper_oauth] %>
-Doorkeeper::Application.create! name: 'Main App', redirect_uri: 'mww://callback', scopes: 'public'
+# You can set the OAuth client ID and client secret in your ENV in order to avoid them being reset each time you reset the database.
+Doorkeeper::Application.create! name: 'Main App', redirect_uri: 'mww://callback', scopes: 'public', uid: ENV['OAUTH_CLIENT_ID'], secret: ENV['OAUTH_CLIENT_SECRET']
 <%- end %>

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

@@ -6,15 +6,10 @@ class SessionsController < ApplicationController
     @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!"
+      redirect_to params[:return_to] || root_url
     else
       flash[:warning] = "You have entered incorrect email and/or password."
       render :new
     end
   end
-
-  def destroy
-    session.delete(:user_id)
-    redirect_to root_path
-  end
 end

data/lib/mobile_workflow/tasks/{env_set.rake → set_env.rake}

@@ -44,15 +44,18 @@ def env_set(path)
   File.write(app_json_path, app_json.to_json)  
 end
 
-namespace :env_set do
-  desc 'Update Android app.json to use new env'
-  task :android do
-    env_set(File.join('app', 'src', 'main', 'res', 'raw', 'app.json'))
-  end
+namespace :mw do
+  namespace :set_env do
+    desc 'Update Android app.json to use new env'
+    task :android do
+      env_set(File.join('app', 'src', 'main', 'res', 'raw', 'app.json'))
+    end
   
-  desc 'Update iOS app.json to use new env'
-  task :ios do
-    project_name = ENV["PROJECT_NAME"]
-    env_set(File.join(project_name, project_name, "Resources", "app.json"))
-  end
+    desc 'Update iOS app.json to use new env'
+    task :ios do
+      project_name = ENV["PROJECT_NAME"]
+      env_set(File.join(project_name, project_name, "Resources", "app.json"))
+    end
+  end  
 end
+

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.6.27'
-  RUBY_VERSION = '2.7.2'
-  RAILS_VERSION = '6.1.0'
+  VERSION = '0.6.31'
+  RUBY_VERSION = '2.7.3'
+  RAILS_VERSION = '6.1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobile_workflow
 version: !ruby/object:Gem::Version
-  version: 0.6.27
+  version: 0.6.31
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.1.3.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ files:
 - lib/mobile_workflow/engine.rb
 - lib/mobile_workflow/open_api_spec/parser.rb
 - lib/mobile_workflow/railtie.rb
-- lib/mobile_workflow/tasks/env_set.rake
+- lib/mobile_workflow/tasks/set_env.rake
 - lib/mobile_workflow/version.rb
 homepage: https://github.com/futureworkshops/mobile_workflow
 licenses:
@@ -152,14 +152,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.2
+      version: 2.7.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A Rails engine to provide API support for Mobile Workflow Apps.