mobile_workflow 0.6.28 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ebd476d336102741c56aada580542d8018ce2bea577b0f86710bff27db18806
-  data.tar.gz: 35261702940609232814b3ddc03a1a11461c5e7f1c2eac30f6e6e207a6fd3e25
+  metadata.gz: 0d460ed2222706c5a2084f87c0d0543e37ed05fdd77857e7e3e0d6929c93e4a5
+  data.tar.gz: 7d67f9e17223c4f72f3c0fb3386001ce5d22a4df631f2767eaa594ecd3827867
 SHA512:
-  metadata.gz: f169638dd406817f73aa82330cbaacd1204a2f2bdf78b8d7e2ea164e611fd139567cd016f07e99c5143102f8bfb6b17eb30095f783bd77c9aede9dde66952d2d
-  data.tar.gz: 2c439d4415e9ae24b0a403aedc9c5fa8d99a5229081cdee88c9e67a3fb14b9491b5ac585cc66bbdbc7423ce4da67138516fd703c840a6527a2a3e952b1715ece
+  metadata.gz: 5108cd81390d9a8663a00c1656ee3de241aa72978168c9142adf2777459251f97c9e9896585c8cfed3eb4bbea356ea1520e2fa5c3fc2f0f6872be1607df4725f
+  data.tar.gz: c3d124f07540ca2ee3945b86cdb08a461d79d1b80d697ae669c1c724a5bcddcd68cd6600f1834c9646a4609829807e7d2320cf142ddfdfd7383d5c215bbef6ee

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/controllers/concerns/mobile_workflow/s3_storable.rb

@@ -12,7 +12,7 @@ module MobileWorkflow
       
           {
             "identifier" => binary["identifier"],
-            "url" => presigned_url("#{object.class.name.underscore}/#{object.id}/#{object_attribute}.#{extension}"),
+            "url" => presigned_url("#{object.class.name.underscore}/#{object.id}/#{object_attribute}/#{SecureRandom.uuid}.#{extension}"),
             "method" => "PUT"
           }
         end

data/app/controllers/mobile_workflow/sns_notifications_controller.rb

@@ -56,10 +56,6 @@ module MobileWorkflow
       end
   
       def attribute_name
-        file_name.split(".")[0] # remove the extension
-      end
-      
-      def file_name
         key_identifiers[2]
       end
   
@@ -67,13 +63,10 @@ module MobileWorkflow
         object_class_name, object_id, attribute_name = object_key.split("/")
         return object_class_name, object_id, attribute_name
       end
-  
+      
       def object_key
-        @object_key ||= message['Records'][0]['s3']['object']['key']
-      end
-  
-      def message
         message = JSON.parse(message_body['Message'])
+        message['Records'][0]['s3']['object']['key']        
       end
  
       def message_body

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

@@ -8,14 +8,14 @@ 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:)
@@ -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

@@ -24,10 +24,6 @@ module MobileWorkflow
         route "mount MobileWorkflow::Engine => '/'"
       end
       
-      def copy_rake_tasks
-        copy_file("lib/tasks/mobile_workflow_doorkeeper.rake") if options[:doorkeeper_oauth]
-      end
-      
       def generate_doorkeeper
         return unless options[:doorkeeper_oauth]
         say "Generating Doorkeeper OAuth"
@@ -35,7 +31,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/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/s3.rake

@@ -0,0 +1,12 @@
+desc "Add S3 storage to a Heroku app"
+namespace :mw do
+  task add_heroku_s3_storage: :environment do
+    require 'mobile_workflow/cli'
+    app_name = ENV['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
+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.28'
+  VERSION = '0.7.0'
   RUBY_VERSION = '2.7.3'
-  RAILS_VERSION = '6.1.0'
+  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.28
+  version: 0.7.0
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-08-01 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
@@ -116,8 +116,6 @@ files:
 - 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/create_users.rb
-- lib/generators/mobile_workflow/install/templates/lib/tasks/mobile_workflow_doorkeeper.rake
-- lib/generators/mobile_workflow/install/templates/lib/tasks/mobile_workflow_s3.rake
 - 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/spec/factories/users.rb
@@ -138,7 +136,8 @@ 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/s3.rake
+- lib/mobile_workflow/tasks/set_env.rake
 - lib/mobile_workflow/version.rb
 homepage: https://github.com/futureworkshops/mobile_workflow
 licenses:

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

@@ -1,5 +0,0 @@
-desc "Log the first Doorkeeper App details"
-task print_oauth_app: :environment do
-  puts Doorkeeper::Application.first.uid
-  puts Doorkeeper::Application.first.secret
-end

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

@@ -1,9 +0,0 @@
-desc "Add S3 storage to your environment"
-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.create
-  aws.create_topic_subscription(heroku.notifications_endpoint)
-end