mobile_workflow 0.6.10 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e72adcc8d3a21ec01476098c7f16fe849c2ab8348f0164fe15ffde1872b156
-  data.tar.gz: 5c361e5591040d4a5636aa425dbf77ec533cddbad38e150a6f1f94a1fdca360e
+  metadata.gz: 70b47d5100717238d1b3a8251f6f4d12ea3b3238574bcfa3d5e1f93fc9ba6147
+  data.tar.gz: d752174d98519ec5ebdd98007b8d8956c9e0b40f845df1200ee50c8a915fb7b5
 SHA512:
-  metadata.gz: 5b66dbaa49b726bc92618c6405af04e3cac7476809ffafeda4d7d444ec3275a993fae2c4a4b6c534ecd5569467c3c8fb4402c97a7b96d1238d1f0c5c34190148
-  data.tar.gz: 67bd8a5575e05e1ec46653b42eadf089a81c05e64ea0c1e6f9702b6e0621e9fd6212e577f13ccbf085a299f53fd1bf288df2db01fd46b2b52d9a748f07aa0518
+  metadata.gz: aaf8809dae9ad487dda543d0619a272aa174dc881c2cb6b941701c0eda093798eadbf46808d05a2a2a828163e3f0068e45d17f099ec149865e72424da75ce9f6
+  data.tar.gz: e7948f530072740a2e7716dafc6b95c5a1176a07be0b6f640332ca23b404edc1bf61a8718736aac7e49a09faae176b73b6393ec0c1c7188e5dfff9c299d2bf90

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

@@ -4,20 +4,27 @@ module MobileWorkflow
     include Rails.application.routes.url_helpers
     
     ON_SUCCESS_OPTIONS = [:none, :reload, :backward, :forward]
-    BUTTON_STYLES = [:primary, :outline, :danger]
-      
+    BUTTON_STYLES = [:primary, :outline, :danger]  
+    CONTENT_MODE_OPTIONS = [:scale_aspect_fill, :scale_aspect_fit]  
+    
     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
-      mw_list_item.compact   
+      mw_list_item.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
   
     def mw_display_text(text:, label: nil)
       {type: :text, label: label, text: text.to_s}.compact
     end
   
-    def mw_display_image(attachment, options: { resize_to_fill: [600, 1200] })
-      {type: :image, previewURL: preview_url(attachment, options: options), url: attachment_url(attachment)}
+    def mw_display_image(attachment, content_mode: :scale_aspect_fill, options: { resize_to_fill: [600, 1200] })
+      validate_content_mode!(content_mode)
+      
+      {type: :image, contentMode: content_mode.to_s.camelize(:lower), previewURL: preview_url(attachment, options: options), url: attachment_url(attachment)}
     end
     
     def mw_display_unsplash_image(image_url)
@@ -54,6 +61,13 @@ module MobileWorkflow
       {type: :button, label: label, url: url, method: method, style: style, onSuccess: on_success}
     end
     
+    def mw_display_button_for_system_url(label:, apple_system_url:, method: :put, style: :primary, on_success: :none)
+      validate_on_success!(on_success)
+      validate_button_style!(style)
+      
+      {type: :button, label: label, appleSystemURL: apple_system_url, method: method, style: style, onSuccess: on_success}
+    end
+    
     def mw_display_button_for_modal_workflow(label:, modal_workflow_name:, style: :primary, on_success: :none)
       validate_on_success!(on_success)
       validate_button_style!(style)
@@ -66,6 +80,10 @@ module MobileWorkflow
       raise 'Unknown on_success action' unless ON_SUCCESS_OPTIONS.include?(on_success)
     end
     
+    def validate_content_mode!(on_success)
+      raise 'Unknown content_mode' unless CONTENT_MODE_OPTIONS.include?(on_success)
+    end
+    
     def validate_button_style!(style)
       raise 'Unknown style' unless BUTTON_STYLES.include?(style)      
     end

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

@@ -24,6 +24,10 @@ 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"

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

@@ -0,0 +1,5 @@
+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/spec/factories/users.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :user do
-    email { 'jo@example.com' }
+    sequence(:email) { |n| "person#{n}@example.com" }
     password { 'Password123' }
   end
 end

data/lib/generators/mobile_workflow/templates/controller.rb.erb

@@ -29,7 +29,7 @@ class <%= controller_class_name %>Controller < ApiController
       render json: { response: @<%= singular_table_name %> }, status: :created      
       <% end -%>
     else
-      head :unprocessable_entity 
+      render json: { message: @<%= singular_table_name %>.errors.full_messages.to_sentence }, status: :unprocessable_entity
     end
   end
 

data/lib/generators/mobile_workflow/templates/controller_spec.rb.erb

@@ -8,7 +8,7 @@ RSpec.describe <%= controller_class_name %>Controller do
   let(:json_response) { JSON.parse(response.body, symbolize_names: true) }
   <% if doorkeeper_oauth? -%>
   let(:user) { create(:user) }
-  let(:token) { instance_double('Doorkeeper::AccessToken', :accessible? => true, :acceptable? => true, resource_owner_id: user.id) }
+  let(:token) { instance_double(Doorkeeper::AccessToken, accessible?: true, acceptable?: true, resource_owner_id: user.id) }
   <% end -%>
 
 <% if index_action? -%>  

data/lib/mobile_workflow/cli/app_builder.rb

@@ -66,7 +66,22 @@ CODE
     end
     
     def format_source
-      run 'rufo .'
+      `rufo .`
+    end
+    
+    def generate_dot_env
+      admin_user = 'admin'
+      admin_password = SecureRandom.base64(12)
+      
+      file '.env', <<-CODE
+ADMIN_USER=#{admin_user}
+ADMIN_PASSWORD=#{admin_password}
+CODE
+    end
+    
+    def git_commit(message = 'Initial commit')
+      git add: "."
+      git commit: %Q{ -m '#{message}'}
     end
     
     def s3_backend(region)

data/lib/mobile_workflow/cli/app_server_generator.rb

@@ -40,10 +40,8 @@ module MobileWorkflow::Cli
         build :migrate_db
         build :administrate_generator
         build :format_source
-        
-        generate_dot_env
-        initial_git_commit
-        
+        build :generate_dot_env
+        build :git_commit
         build :heroku if options[:heroku]
         build :dokku, options[:dokku_host] if options[:dokku]
         build :s3_backend, options[:aws_region] if options[:s3_storage]
@@ -56,22 +54,5 @@ module MobileWorkflow::Cli
       ::MobileWorkflow::Cli::AppBuilder
     end
     
-    # Todo: MBS - move these methods to the builder class
-    # Ideally override RailsBuilder methods
-    private
-    def initial_git_commit
-      git add: "."
-      git commit: %Q{ -m 'Initial commit' }
-    end
-
-    def generate_dot_env
-      admin_user = 'admin'
-      admin_password = SecureRandom.base64(12)
-      
-      file '.env', <<-CODE
-ADMIN_USER=#{admin_user}
-ADMIN_PASSWORD=#{admin_password}
-CODE
-    end
   end
 end

data/lib/mobile_workflow/cli/aws_backend.rb

@@ -5,7 +5,7 @@ module MobileWorkflow::Cli
   
     attr_accessor :access_id, :secret_key, :region, :bucket_name
   
-    def initialize(app_name:, region:)
+    def initialize(app_name:, region: 'us-east-1')
       @app_name = app_name
       @aws_name = @app_name.gsub("_", "-")
       @region = region

data/lib/mobile_workflow/open_api_spec/parser.rb

@@ -2,9 +2,6 @@ module MobileWorkflow
   module OpenApiSpec
     class Parser
   
-      # Schemas to avoid generating models for (static items from MW)
-      SKIP_SCHEMAS = ["attachment", "ListItem", "DisplayItem", "DisplayText", "DisplayButton", "DisplayImage", "DisplayVideo"]
-  
       def initialize(open_api_spec_string)
         @open_api_spec_string = open_api_spec_string
       end
@@ -12,7 +9,7 @@ module MobileWorkflow
       def model_name_to_properties
         @model_properties = {}
         schemas.each_pair do |model_name, schema|
-          next if SKIP_SCHEMAS.include? model_name # Don't generate schemas for MW schemas
+          next if model_name.start_with?("MW")
     
           model_name = model_name.underscore
           model_properties = schema_model_properties(model_name, schema)

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.6.10'
+  VERSION = '0.6.15'
   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.10
+  version: 0.6.15
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,6 +115,7 @@ 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/seeds.rb.erb
 - lib/generators/mobile_workflow/install/templates/sessions_controller.rb.erb
 - lib/generators/mobile_workflow/install/templates/spec/factories/users.rb