mobile_workflow 0.6.19 → 0.6.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7fe89a8c821aadb94b5652d399ff179273ccd0a335cb51625857d4955816e3c
-  data.tar.gz: e9b2776c45c386a21fa7c0e9629831bcda9430b7673dee9a809a186c9539954d
+  metadata.gz: f9775519f09048d28dd30bf4f4483a469eed3660cea3860d8a24e67de1408799
+  data.tar.gz: 1d1a5f7c56a128b056e5d7cdb97b0e01c90525b0bb0aeffea409ffa4aecca9c1
 SHA512:
-  metadata.gz: f6765e6311ea22b67e4e545aed7521a5e36723f8d011816d0186f4556b7180359bc2fd4d7ed115314c92607062f7f24fe336dc52b4a2a6614b5c1757ca60ba38
-  data.tar.gz: 5a8f738acc4203116bc6f5ba6c5034e809c4e9f5a5988436ba068bebc85d90380e60a088482722c34ccb3dc645b1f6b92b6c5ecfb2b5214480aa3c57d4032abe
+  metadata.gz: c4209f4dd3e731a189da554458c36f06af935e51f5b2b2b52621e9123f4825d14b35c39b42f7a989aa051557db06f3a7edbce2ed43f905397b3bf4254fca30d8
+  data.tar.gz: c1781869445e2ba3ffb97824a071ad95a0735c9d778062df73e9d063c39f5590cf0a128a60e43fd5fe737bf322efa691e368316c304582f35d7901fd663cdb7b

data/app/controllers/concerns/mobile_workflow/s3_storable.rb

@@ -6,12 +6,13 @@ module MobileWorkflow
       def binary_urls(object)
         return unless params["binaries"]
     
-        params["binaries"].collect do |binary|
-          extension = binary["mimetype"].split('/')[1] # i.e. image/jpg --> image, video/mp4 --> video
+        params["binaries"].map do |binary|
+          object_attribute = binary["identifier"]
+          extension = binary["mimetype"].split('/')[1] # i.e. image/jpg --> jpg, video/mp4 --> mp4
       
           {
             "identifier" => binary["identifier"],
-            "url" => presigned_url("#{object.class.name.underscore}/#{object.id}/#{binary["identifier"]}.#{extension}"),
+            "url" => presigned_url("#{object.class.name.underscore}/#{object.id}/#{object_attribute}.#{extension}"),
             "method" => "PUT"
           }
         end

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

@@ -5,7 +5,8 @@ module MobileWorkflow
     
     ON_SUCCESS_OPTIONS = [:none, :reload, :backward, :forward]
     BUTTON_STYLES = [:primary, :outline, :danger]  
-    CONTENT_MODE_OPTIONS = [:scale_aspect_fill, :scale_aspect_fit]  
+    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}
@@ -37,7 +38,7 @@ module MobileWorkflow
         image_url = "https://source.unsplash.com/#{unsplash_id}/800x600"
       end
       
-      {type: :image, previewURL: image_url, url: image_url}
+      {type: :image, previewURL: image_url, url: image_url}.compact
     end
     
     def mw_display_video(attachment, preview_options: { resize_to_fill: [600, 1200] })
@@ -48,35 +49,70 @@ module MobileWorkflow
       validate_on_success!(on_success)
       validate_button_style!(style)
       
-      {type: :button, label: label, style: style, onSuccess: on_success}
+      {type: :button, label: label, style: style, onSuccess: on_success}.compact
     end
   
     def mw_display_delete_button(url:, label: "Delete", method: :delete, style: :danger, on_success: :backward)
       validate_on_success!(on_success)
       validate_button_style!(style)
       
-      {type: :button, label: label, url: url, method: method, style: style, onSuccess: on_success}
+      {type: :button, label: label, url: url, method: method, style: style, onSuccess: on_success}.compact
     end
-    
-    def mw_display_button_for_url(label:, url:, method: :put, style: :primary, on_success: :reload)
+        
+    def mw_display_url_button(label:, url:, method: :put, style: :primary, confirm_title: nil, confirm_text: nil, on_success: :reload)
       validate_on_success!(on_success)
       validate_button_style!(style)
       
-      {type: :button, label: label, url: url, method: method, style: style, onSuccess: on_success}
+      {type: :button, label: label, url: url, method: method, style: style, confirmTitle: confirm_title, confirmText: confirm_text, onSuccess: on_success}.compact
     end
+    alias_method :mw_display_button_for_url, :mw_display_url_button
     
-    def mw_display_button_for_system_url(label:, apple_system_url: nil, android_deep_link: nil, style: :primary)
+    def mw_display_system_url_button(label:, apple_system_url: nil, android_deep_link: nil, style: :primary)
       validate_button_style!(style)
       raise 'Invalid android_deep_link' unless android_deep_link.start_with?('http')
       
       {type: :button, label: label, appleSystemURL: apple_system_url, androidDeepLink: android_deep_link, style: style}.compact
     end
+    alias_method :mw_display_button_for_system_url, :mw_display_system_url_button
     
-    def mw_display_button_for_modal_workflow(label:, modal_workflow_name:, style: :primary, on_success: :none)
+    def mw_display_modal_workflow_button(label:, modal_workflow_name:, style: :primary, on_success: :none)
       validate_on_success!(on_success)
       validate_button_style!(style)
       
-      {type: :button, label: label, modalWorkflow: modal_workflow_name, style: style, onSuccess: on_success}
+      {type: :button, label: label, modalWorkflow: modal_workflow_name, style: style, onSuccess: on_success}.compact
+    end
+    alias_method :mw_display_button_for_modal_workflow, :mw_display_modal_workflow_button
+    
+    def mw_text_choice_question(question:, style:, text_choices:)
+      raise 'Missing question' if question.blank?
+      raise 'Text Choices should be a hash' unless text_choices.is_a?(Hash)
+      validate_question_style!(style)
+      
+      text_choices_a = text_choices.map{|k, v| {_class: "ORKTextChoice", exclusive: false, text: k, value: v} }.to_a
+      { question: question, answerFormat: { _class: "ORKTextChoiceAnswerFormat", style: style.to_s.camelize(:lower), textChoices: text_choices_a}}
+    end
+    
+    def mw_grid_large_section(id:, text:)
+      raise 'Missing id' if id.nil?
+      raise 'Missing text' if text.nil?
+      
+      { id: id, text: text, type: :largeSection }
+    end
+    
+    def mw_grid_small_section(id:, text:)
+      raise 'Missing id' if id.nil?
+      raise 'Missing text' if text.nil?
+      
+      { id: id, text: text, type: :smallSection }
+    end
+    
+    def mw_grid_item(id:, text:, image_attachment: nil)
+      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: [600, 600] }) if image_attachment
+      item
     end
   
     private
@@ -92,6 +128,10 @@ module MobileWorkflow
       raise 'Unknown style' unless BUTTON_STYLES.include?(style)      
     end
     
+    def validate_question_style!(style)
+      raise 'Unknown style' unless QUESTION_STYLES.include?(style)      
+    end
+    
     def preview_url(attachment, options:)
       return nil unless attachment.attached?
 

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

@@ -52,6 +52,9 @@ module MobileWorkflow
       def generate_models
         say "Loading OpenAPI Spec: #{open_api_spec_path}"
         say "Generating models"
+        
+        copy_file("app/models/application_record.rb")
+        
         model_name_to_properties.each_pair do |model_name, model_properties|   
           
           if doorkeeper_oauth?

data/lib/mobile_workflow.rb

@@ -1,5 +1,5 @@
 require "mobile_workflow/engine"
 
 module MobileWorkflow
-  # Your code goes here...
+  require 'mobile_workflow/railtie' if defined?(Rails)
 end

data/lib/mobile_workflow/railtie.rb

@@ -0,0 +1,13 @@
+require 'mobile_workflow'
+require 'rails'
+
+module MobileWorkflow
+  class Railtie < Rails::Railtie
+    railtie_name :mobile_workflow
+
+    rake_tasks do
+      path = File.expand_path(__dir__)
+      Dir.glob("#{path}/tasks/**/*.rake").each { |f| load f }
+    end
+  end
+end

data/lib/mobile_workflow/tasks/env_set.rake

@@ -0,0 +1,58 @@
+require 'json'
+
+def each_step(json, type)
+  json['workflows'].map{|w| w["steps"].select {|s| s["type"] == type.to_s}}.flatten.each do |step|
+    yield(step)
+  end
+end
+
+def replace_oauth(app_json)
+  client_id = ENV["CLIENT_ID"]
+  client_secret = ENV["CLIENT_SECRET"]
+  redirect_scheme = ENV["SCHEME"]
+  
+  each_step(app_json, :networkOAuth2) do |step|
+    step["items"].each do |item|
+      if item["oAuth2ClientId"]
+        item["oAuth2ClientId"] = client_id
+        item["oAuth2ClientSecret"] = client_secret
+        item["oAuth2RedirectScheme"] = redirect_scheme
+      end      
+    end
+  end  
+end
+
+def replace_servers(app_json)
+  server_url = ENV["SERVER_URL"]
+  base_url = ENV["PREVIOUS_SERVER_URL"]
+  
+  app_json["servers"].each do |server|
+    server["url"] = server_url
+  end
+
+  each_step(app_json, :display) do |step|
+    step["items"].each do |item|
+      ["appleSystemURL", "androidDeepLink"].each{|key| item[key] = item[key].gsub(base_url, server_url) }
+    end
+  end
+end
+
+def env_set(path)
+  app_json = JSON.parse(File.read(app_json_path))
+  replace_oauth(app_json)
+  replace_servers(app_json)
+  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
+  
+  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

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.6.19'
+  VERSION = '0.6.24'
   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.6.19
+  version: 0.6.24
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-03 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -137,6 +137,8 @@ files:
 - lib/mobile_workflow/cli/heroku_backend.rb
 - 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/version.rb
 homepage: https://github.com/futureworkshops/mobile_workflow
 licenses: