mobile_workflow 0.6.21 → 0.6.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 974cb70825d3d8b73af77e17adaedf222d6e67e0b0940c0d7158dac1d3c12c3e
-  data.tar.gz: 35588fbd42ae9dacf7e0e0162df48d7442126c7e874efc14fa1fd440b7989dfb
+  metadata.gz: 65e12da53f92edfa4c06876329b205e1f71990ee264175cb4a9355672c5f75d9
+  data.tar.gz: b021eff511808e096e8853ae9b3e8d0d5e305b3163941b1480e10630df9463ef
 SHA512:
-  metadata.gz: b54532ff2c16360d7ec9b9bdd8e5b0fe22b793a41cad4c090a447c35c11f961949ab948c78afb89063eccc9c6f5622abc8db42812ee096734b9235916f45c537
-  data.tar.gz: 67d3a4b2889644571377b9bd1ef69a56ce5e0bc577e053cdd2f5915c877163632fd4b27354c8182af26e26e729d3de73d9bc47c1b165aee9381ae3d7d097b019
+  metadata.gz: '09221ae3237245c92776a17665c58f6672302537213b763f4d8c3710ab0856f96a3a4a6615cc631fcf11efc25ab8a099edbabdc86d99e99b48e43846d4bd5097'
+  data.tar.gz: a0ff5ad06eb925171419d07b0243a8288402fd5731c1b8a761f21ac2440e4524599d91dc56655aab308451a0a12dd9b10478cba55a7b0becf36ee616062c9a52

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}
@@ -13,6 +14,10 @@ module MobileWorkflow
       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
+    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
     end
@@ -44,43 +49,75 @@ module MobileWorkflow
       {type: :video, previewURL: preview_url(attachment, options: preview_options), url: attachment_url(attachment)}
     end
   
-    def mw_display_button(label:, style: :primary, on_success: :forward)
+    def mw_display_button(label:, style: :primary, on_success: :forward, sf_symbol_name: nil, material_icon_name: nil)
       validate_on_success!(on_success)
       validate_button_style!(style)
       
-      {type: :button, label: label, style: style, onSuccess: on_success}.compact
+      {type: :button, label: label, style: style, onSuccess: on_success, sfSymbolName: sf_symbol_name, materialIconName: material_icon_name}.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}.compact
+      {type: :button, label: label, url: url, method: method, style: style, onSuccess: on_success, sfSymbolName: 'trash', materialIconName: 'delete'}.compact
     end
         
-    def mw_display_url_button(label:, url:, method: :put, style: :primary, confirm_title: nil, confirm_text: nil, on_success: :reload)
+    def mw_display_url_button(label:, url:, method: :put, style: :primary, confirm_title: nil, confirm_text: nil, on_success: :reload, sf_symbol_name: nil, material_icon_name: nil)
       validate_on_success!(on_success)
       validate_button_style!(style)
       
-      {type: :button, label: label, url: url, method: method, style: style, confirmTitle: confirm_title, confirmText: confirm_text, onSuccess: on_success}.compact
+      {type: :button, label: label, url: url, method: method, style: style, confirmTitle: confirm_title, confirmText: confirm_text, onSuccess: on_success, sfSymbolName: sf_symbol_name, materialIconName: material_icon_name}.compact
     end
     alias_method :mw_display_button_for_url, :mw_display_url_button
     
-    def mw_display_system_url_button(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, sf_symbol_name: nil, material_icon_name: nil)
       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
+      {type: :button, label: label, appleSystemURL: apple_system_url, androidDeepLink: android_deep_link, style: style, sfSymbolName: sf_symbol_name, materialIconName: material_icon_name}.compact
     end
     alias_method :mw_display_button_for_system_url, :mw_display_system_url_button
     
-    def mw_display_modal_workflow_button(label:, modal_workflow_name:, style: :primary, on_success: :none)
+    def mw_display_modal_workflow_button(label:, modal_workflow_name:, style: :primary, on_success: :none, sf_symbol_name: nil, material_icon_name: nil)
       validate_on_success!(on_success)
       validate_button_style!(style)
       
-      {type: :button, label: label, modalWorkflow: modal_workflow_name, style: style, onSuccess: on_success}.compact
+      {type: :button, label: label, modalWorkflow: modal_workflow_name, style: style, onSuccess: on_success, sfSymbolName: sf_symbol_name, materialIconName: material_icon_name}.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: self.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
     def validate_on_success!(on_success)
@@ -95,6 +132,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/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.6.21'
+  VERSION = '0.6.26'
   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.21
+  version: 0.6.26
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails