mobile_workflow 0.5.2 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 041f527fb56b89086f71921c2f7042b0874d11f4cb264123d7fc023331cd7c8a
-  data.tar.gz: 9cff904cabee6ca078120c19c6ea9f45345dd2f882add3b1aa74142fbc7cd6c6
+  metadata.gz: 843610afaa8207693d3f1be346698ca58e4022a3575b6953ef52c343781c649c
+  data.tar.gz: b787b24ab9fbf0f47910a889f23a59094d214db55c6eb0950609b674ba01ed64
 SHA512:
-  metadata.gz: cf75977ab7da901813bc2ced43dc325c1f1beda300553538c5f352b5537de13fd9047e3c5b483855c42e49070b569c58bf3bfb6501e8fe5bab41f93abed762e5
-  data.tar.gz: 3d439a644c645a708b5b1a2ba6cc48be2366fbffa9f021e016e994156b2030367fa586051315a650950cbe70a8b3a01af625d693789971ef39a8b77351df3841
+  metadata.gz: 427d7c382ebc60cdf5ebd79f4257d2ec268cd0f52d7c7bd583afc1774c3adecaef910b163e06d1a754fa2340dfd352f23ae3c06056d97762e7b6fe878713b7cc
+  data.tar.gz: e98d3ebb68a12e42b3911d63fe16e4fe578ece0fc8e86814ac401d80a171fcd854d7a42f1a522fc535fc06d56eed1bb902e2a597b3d9d73a4c3c2b4603ce59a7

data/app/controllers/mobile_workflow/sns_notifications_controller.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  class SnsNotificationsController < ApiController
+  class SnsNotificationsController < ActionController::API
     if Object.const_defined?("Aws::S3") && Object.const_defined?("Aws::SNS")
       before_action :verify_request_authenticity
  

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

@@ -8,7 +8,7 @@ module MobileWorkflow
       
     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, height: 100, width: 100) if image_attachment
+      mw_list_item[:imageURL] = preview_url(image_attachment, options: { resize_to_fill: [100, 100] }) if image_attachment
       mw_list_item.compact   
     end
   
@@ -16,8 +16,8 @@ module MobileWorkflow
       {type: :text, label: label, text: text.to_s}.compact
     end
   
-    def mw_display_image(attachment)
-      {type: :image, previewURL: preview_url(attachment, height: 600, width: 1200), url: attachment_url(attachment)}
+    def mw_display_image(attachment, options: { resize_to_fill: [600, 1200] })
+      {type: :image, previewURL: preview_url(attachment, options: options), url: attachment_url(attachment)}
     end
     
     def mw_display_unsplash_image(image_url)
@@ -29,8 +29,8 @@ module MobileWorkflow
       {type: :image, previewURL: image_url, url: image_url}
     end
     
-    def mw_display_video(attachment)
-      {type: :video, previewURL: preview_url(attachment, height: 600, width: 1200), url: attachment_url(attachment)}
+    def mw_display_video(attachment, preview_options: { resize_to_fill: [600, 1200] })
+      {type: :video, previewURL: preview_url(attachment, options: preview_options), url: attachment_url(attachment)}
     end
   
     def mw_display_button(label:, style: :primary, on_success: :forward)
@@ -69,12 +69,12 @@ module MobileWorkflow
     def validate_button_style!(style)
       raise 'Unknown style' unless BUTTON_STYLES.include?(style)      
     end
-  
-    def preview_url(attachment, height:, width:, options: { resize_to_fill: [height, width]} )
+    
+    def preview_url(attachment, options:)
       return nil unless attachment.attached?
 
       if attachment.image?
-        Rails.application.routes.url_helpers.rails_representation_url(attachment.variant(combine_options: options), host: attachment_host)
+        Rails.application.routes.url_helpers.rails_representation_url(attachment.variant(options), host: attachment_host)
       elsif attachment.previewable?
         Rails.application.routes.url_helpers.rails_representation_url(attachment.preview(options), host: attachment_host)
       else

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

@@ -78,7 +78,7 @@ module MobileWorkflow
       
       def read_openapi_spec
         say "Loading OpenAPI Spec: #{open_api_spec_path}" 
-        return JSON.parse(File.read(File.join(Rails.root, open_api_spec_path))).with_indifferent_access 
+        return JSON.parse(File.read(open_api_spec_path)).with_indifferent_access 
       end
       
       def open_api_spec_path

data/lib/generators/mobile_workflow/install/templates/Gemfile.erb

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.6.6'
+ruby '2.7.2'
 
 # Core Gems
 gem 'rails', '~> 6.1.0'
@@ -11,7 +11,8 @@ gem 'turbolinks', '~> 5'
 
 # Mobile Workflow
 #gem 'mobile_workflow', path: '../mobile_workflow'
-gem 'mobile_workflow', github: 'FutureWorkshops/mobile_workflow'
+#gem 'mobile_workflow', github: 'FutureWorkshops/mobile_workflow'
+gem 'mobile_workflow', '0.5.5'
 
 # Authorisation / Authentication
 <%- if options[:doorkeeper_oauth] %>

data/lib/mobile_workflow/cli/app_builder.rb

@@ -18,7 +18,8 @@ module MobileWorkflow::Cli
     end
 
     def administrate_generator
-      rails_command 'generate administrate:install'
+      Bundler.with_unbundled_env { generate 'administrate:install' }
+      
       file 'app/assets/config/manifest.js', <<-CODE
 //= link administrate/application.css
 //= link administrate/application.js
@@ -31,7 +32,8 @@ module Admin
   end
 end
 CODE
-      generate 'administrate:routes'      
+
+      Bundler.with_unbundled_env { generate 'administrate:routes' }
     end
     
     def ability_generator

data/lib/mobile_workflow/cli/app_server_generator.rb

@@ -51,16 +51,18 @@ module MobileWorkflow::Cli
     protected
 
     def get_builder_class
-      MobileWorkflow::Cli::AppBuilder
+      ::MobileWorkflow::Cli::AppBuilder
     end
     
     # Todo: MBS - move these methods to the builder class
     # Ideally override RailsBuilder methods
     private
     def setup_db
-      rails_command "db:drop"
-      rails_command "db:create"
-      rails_command "db:migrate"
+      Bundler.with_unbundled_env do 
+        rails_command("db:drop")
+        rails_command("db:create")
+        rails_command("db:migrate")
+      end
     end
 
     def initial_git_commit

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.5.2'
+  VERSION = '0.5.7'
   RUBY_VERSION = '2.5.5'
   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.5.2
+  version: 0.5.7
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A Rails engine to provide API support for Mobile Workflow Apps.