mobile_workflow 0.5.1 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1d55314927070ee5d1b4498b99b760952214839e146ae0e271bc2ff49a1fce9
-  data.tar.gz: e666ed9c786f10335e1d30505a4f62059636034821d3e4e2d17d532929bfee93
+  metadata.gz: a2a4d13fe23a8f256052b54fa14424c54d847bb327bf57128159b9dd8ffd334a
+  data.tar.gz: 0aa96388f99ac5f8ae69a1e6a06559c58c9eab58c355f877b259137472a3b176
 SHA512:
-  metadata.gz: 80da58aa822183db3273fd34e89b9563040349bc17b60f8817f467f59561e2d7e1684ecaa48b85f88e3993ac7819538fb0515b0aeaddf513727f3f033117b5be
-  data.tar.gz: 6ad8369700ca16b92de687238fabad59f9bd695c9b8941d85beae13edd38d338a658edc5e5085439c3944d63f855f5ae3078ed4cd17467283dd121b7d4b8e848
+  metadata.gz: 7f5890bf8381f177530fe3607e5ec4fe276258638f4a28213665c7c2dab5724ed14fb4a9f3ea3027581c41499c4fb995701e4b08138d0d31466f4781aa8f279e
+  data.tar.gz: 7b5c52f4a9b754078eb0c1a70b6213bf5b33f9825f1c67ce0325199b5c2bc1038cde0044b951baccdb6120c7fa2b46546349258c444cca4db7b438a96dbd5b3f

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/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

@@ -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

@@ -16,6 +16,25 @@ module MobileWorkflow::Cli
     def rspec_generator
       generate 'rspec:install'
     end
+
+    def administrate_generator
+      Bundler.with_unbundled_env { generate 'administrate:install' }
+      
+      file 'app/assets/config/manifest.js', <<-CODE
+//= link administrate/application.css
+//= link administrate/application.js
+    CODE
+  
+      file 'app/controllers/admin/application_controller.rb', <<-CODE
+module Admin
+  class ApplicationController < Administrate::ApplicationController
+    http_basic_authenticate_with(name: ENV["ADMIN_USER"], password: ENV["ADMIN_PASSWORD"])
+  end
+end
+CODE
+
+      Bundler.with_unbundled_env { generate 'administrate:routes' }
+    end
     
     def ability_generator
       copy_file 'ability.rb', 'app/models/ability.rb'

data/lib/mobile_workflow/cli/app_server_generator.rb

@@ -37,7 +37,7 @@ module MobileWorkflow::Cli
         build :active_storage if options[:s3_storage] 
         build :mobile_workflow_generator, ARGV[1]
         setup_db
-        generate_administrate
+        build :administrate_generator
         
         generate_dot_env
         initial_git_commit
@@ -51,33 +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 generate_administrate
-      generate 'administrate:install'
-      file 'app/assets/config/manifest.js', <<-CODE
-//= link administrate/application.css
-//= link administrate/application.js
-    CODE
-  
-      file 'app/controllers/admin/application_controller.rb', <<-CODE
-module Admin
-  class ApplicationController < Administrate::ApplicationController
-    http_basic_authenticate_with(name: ENV["ADMIN_USER"], password: ENV["ADMIN_PASSWORD"])
-  end
-end
-CODE
-      generate 'administrate:routes'
-    end
-
     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.1'
+  VERSION = '0.5.6'
   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.1
+  version: 0.5.6
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails