mobile_workflow 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afd70f8306883bf02437d339e139b700a03bc857002a858b913589ad356a81ee
-  data.tar.gz: b600bd3e81c28f76f32eb927fdd8fbb7c678797f51f5e9df056495a7dad9612c
+  metadata.gz: 24275da71a904cd964d375ab0eea9678d71cda4c6aaba01d9f6bcb0c8c122d48
+  data.tar.gz: 5fea2ff0337152f12bb11a8e4e0dad5193d17bb6a44644b3f7b5800de213f7c8
 SHA512:
-  metadata.gz: 6eeccc0de8e02f651c6f838cf35fe9408353f29e1bfbf97bf92487e78d8c3f407802a9e52389162e894fd5cafde30197077a73a88a8965674c30466feac4317e
-  data.tar.gz: 6261a5fa26b4dc7d5b7822d258dc86567e12780a4cfa90f6bcdfe8303895c59dee20fdb83631fe528e7d130b2b8fc58d9810dcf30522bda36adb5c46f7b54dd6
+  metadata.gz: 26e0e811ed07bd4bfc616ac938ef549e6ad9a5a1335dd1f601c34411fb595a0aa8813c219103cf2ede81eedfa935a195440d9a62a03b97fbe8384db0520e65cb
+  data.tar.gz: 1aab026098618375eae9fe91311fa2771111be6f72cfc3436cf6b8f9de274aba158fe5bf87b1b3cd648118570e92dde2ee22724379a16b1b0699c26ceb339da0

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

@@ -17,11 +17,20 @@ module MobileWorkflow
     end
   
     def mw_display_image(attachment)
-      {type: :image, previewURL: preview_url(attachment, height: 300, width: 600), url: attachment_url(attachment)}
+      {type: :image, previewURL: preview_url(attachment, height: 600, width: 1200), url: attachment_url(attachment)}
+    end
+    
+    def mw_display_unsplash_image(image_url)
+      if image_url.start_with? "https://unsplash.com/photos"
+        unsplash_id = image_url.split('/').last
+        image_url = "https://source.unsplash.com/#{unsplash_id}/800x600"
+      end
+      
+      {type: :image, previewURL: image_url, url: image_url}
     end
     
     def mw_display_video(attachment)
-      {type: :video, previewURL: preview_url(attachment, height: 300, width: 600), url: attachment_url(attachment)}
+      {type: :video, previewURL: preview_url(attachment, height: 600, width: 1200), url: attachment_url(attachment)}
     end
   
     def mw_display_button(label:, style: :primary, on_success: :forward)
@@ -45,11 +54,11 @@ module MobileWorkflow
       {type: :button, label: label, url: url, method: method, style: style, onSuccess: on_success}
     end
     
-    def mw_display_button_for_modal_workflow(label:, modal_workflow:, style: :primary, on_success: :none)
+    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)
       
-      {type: :button, label: label, modalWorkflow: modal_workflow, style: style, onSuccess: on_success}
+      {type: :button, label: label, modalWorkflow: modal_workflow_name, style: style, onSuccess: on_success}
     end
   
     private

data/lib/generators/mobile_workflow/controller_generator.rb

@@ -23,14 +23,6 @@ module MobileWorkflow
         params = attributes_names.map{ |name| ":#{name}" }
         params.join(", ")
       end
-      
-      def rewrite_params
-        if attributes_names
-          init_params = "\n\t\tparams[:#{singular_table_name}] = {}\n"
-          rewrite_params = attributes_names.map {|name| "params[:#{singular_table_name}][:#{name}] = params.dig(:payload, :#{name}, :answer)" }.join("\n\t\t")
-          init_params + rewrite_params
-        end
-      end
     end
   end
 end

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

@@ -94,14 +94,10 @@ module MobileWorkflow
       end
       
       def model_property_type(property)
-        case property['$ref']
-        when "#/components/schemas/answer"
-          'string'
-        when "#/components/schemas/attachment"
-          'attachment'
-        else
-          'string'
-        end
+        return property["type"] unless property["type"].blank?
+        return 'attachment' if property['$ref'] == "#/components/schemas/attachment"
+        
+        raise 'Unknown property type'
       end
     end
   end

data/lib/generators/mobile_workflow/install/templates/api_controller.rb.erb

@@ -1,9 +1,14 @@
 class ApiController < ActionController::API
+  rescue_from CanCan::AccessDenied do |exception|
+    Rails.logger.debug "Access denied on #{exception.action} #{exception.subject.inspect}"
+    head :forbidden
+  end
+
   <% if options[:doorkeeper_oauth] %>
   before_action :doorkeeper_authorize!, unless: :anonymous_action?
   
   def current_resource_owner
-    User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
+    User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token&.accessible?
   end
   alias_method :current_user, :current_resource_owner
   

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

@@ -24,19 +24,16 @@ class <%= controller_class_name %>Controller < ApiController
   private
   def rewrite_payload
     # Use this method to make any changes to params to make them compatible with ActiveRecord
-  
-    # 1. Example to get properties from question
-    # params[:payload][:name] = params.dig(:payload, :name, :answer)
-  
-    # 2. Example to get selected id from a list
+    
+    # 1. Example to get selected id from a list
     # passport_id = params.dig(:payload, :choose_passport, :selected, :id)
 
     Rails.logger.debug "Pre-rewrite params: #{params}"
-    <%= rewrite_params %> 
+    # Do your rewriting here
   end
 
   def <%= singular_table_name.underscore %>_params
-    params.require(:<%= singular_table_name %>).permit(<%= permitted_params %>)
+    params.require(:payload).permit(<%= permitted_params %>)
   end
 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) }
   
   describe 'GET #index' do
-    let!(:<%= controller_class_name.singularize.underscore %>) { <%= controller_class_name.singularize %>.create }
+    let!(:<%= controller_class_name.singularize.underscore %>) { create(:<%= controller_class_name.singularize.underscore %>) }
     before(:each) { get :index, params: params }
     
     context 'ok' do
@@ -18,7 +18,7 @@ RSpec.describe <%= controller_class_name %>Controller do
   end
   
   describe 'GET #show' do
-    let(:<%= controller_class_name.singularize.underscore %>) { <%= controller_class_name.singularize %>.create }
+    let(:<%= controller_class_name.singularize.underscore %>) { create(:<%= controller_class_name.singularize.underscore %>) }
     let(:params) { { id: <%= controller_class_name.singularize.underscore %>.id } }
     before(:each) { get :show, params: params }
     

data/lib/mobile_workflow/version.rb

@@ -1,3 +1,3 @@
 module MobileWorkflow
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobile_workflow
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails