mobile_workflow 0.6.29 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95b8a4e615993e80a85d0440c2a2d0233ac72a6c0b08ccf28b2b09ffd1113815
-  data.tar.gz: 63540e27a1e5cfcfcf85acec5d256750806e13b49ac2588b038ff422d42a4e76
+  metadata.gz: 42cd747cb8c3c662f14627be3d808760f354be5cfaa70b4559b830741ca8aa24
+  data.tar.gz: 18e2bcc68d979fd3026a852457e13b72ad29484e75d3932df669f655059833cd
 SHA512:
-  metadata.gz: ad51b31fe398ca8197007d1f917469e2ccce6337e4700982ce2b5c37a94361f787a2ba8b9b668e4fecc6845000418b4c2b3fa2214a7840d1ee9e95b3df55e968
-  data.tar.gz: 0a4ef7514e5d137ac2c6e7017bc3f0fb87b09fe9884732b42700d9f9eb3f7b4af8e6ee474a3b24210e52e89ec4d3c76028e953da1feaaf28f62adf1e4a1531d0
+  metadata.gz: ac60eed8aa944ba409c83a82ed7392542a533bc4191c875728e52b8a0e4ed72e2e92642ce4852edf94374e4237d963d674e15c29536ba268856b4e56b6726ed4
+  data.tar.gz: a9b836f8d92cd8df70d93ec9fd3f6f5603777b308b1bde5124f46195d46dd3065604b8281b5e72203cbddfeae2c8f39744bc18eef2806ea04584e66981104d26

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,13 +12,17 @@ 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}/#{uuid}.#{extension}"),
             "method" => "PUT"
           }
         end
       end
   
       private
+      def uuid
+        SecureRandom.uuid
+      end
+      
       def presigned_url(key)
         presigner.presigned_url(:put_object, bucket: ENV['AWS_BUCKET_NAME'], key: key, metadata: {})
       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

@@ -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.29'
+  VERSION = '0.7.1'
   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.29
+  version: 0.7.1
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-02 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