mobile_workflow 0.6.31 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37eb1d708549f31b01aca9e6cb6c68b2e0778f647c326c6f2ed54e55f64c58c0
-  data.tar.gz: 5b23a0cd92a3b8c3a9931651c9eb37322fdd693f44700aac1da684764fc8b5ef
+  metadata.gz: 026fc97366b9da9d1cdd8c27935c9c120a872fc0f666e3e8dec8ebe881e36c8e
+  data.tar.gz: 2963f07f4173b235411a1256a5ab716805edebc78cd82c60603603316a861284
 SHA512:
-  metadata.gz: 1c345303b25a33807e58ca50e4ea1cea90853c896361f90b492f80d55306e45552fea574a28b0e548f1318e225519e478d3bb102e8a5f36d06ee773750aacded
-  data.tar.gz: 232110a1e208baddf77c246e4d7727cb6fb4f21ae06689e54a2e43be2db2fab0b3e48a99a25bf64a9759e1b904584b707d6bf2e0c134da616459dee6b8c0e3b6
+  metadata.gz: 297c0feb073d5172064eb35168aff8864b7d523e91bc9f0bcbede72ad16c2fb2e4507aea89b52f21fc921dbef299f00b2b9d8765c595f1e1435392bbd84a2693
+  data.tar.gz: 9d3442386b9f5846dca8124f2bdb878302992bb42142b6ac3601abd3fd14d3c556051c261f210faf98bc24e21adf8edb5ff2b16ead759dccfb6fe0878c7b755c

data/app/controllers/concerns/mobile_workflow/s3_storable.rb

@@ -12,13 +12,17 @@ module MobileWorkflow
       
           {
             "identifier" => binary["identifier"],
-            "url" => presigned_url("#{object.class.name.underscore}/#{object.id}/#{object_attribute}.#{extension}"),
+            "url" => presigned_url("#{object.class.name.underscore}/#{object.id}/#{object_attribute}/#{s3_object_uuid}.#{extension}"),
             "method" => "PUT"
           }
         end
       end
   
       private
+      def s3_object_uuid
+        SecureRandom.uuid
+      end
+      
       def presigned_url(key)
         presigner.presigned_url(:put_object, bucket: ENV['AWS_BUCKET_NAME'], key: key, metadata: {})
       end

data/app/controllers/mobile_workflow/sns_notifications_controller.rb

@@ -56,10 +56,6 @@ module MobileWorkflow
       end
   
       def attribute_name
-        file_name.split(".")[0] # remove the extension
-      end
-      
-      def file_name
         key_identifiers[2]
       end
   
@@ -67,13 +63,10 @@ module MobileWorkflow
         object_class_name, object_id, attribute_name = object_key.split("/")
         return object_class_name, object_id, attribute_name
       end
-  
+      
       def object_key
-        @object_key ||= message['Records'][0]['s3']['object']['key']
-      end
-  
-      def message
         message = JSON.parse(message_body['Message'])
+        message['Records'][0]['s3']['object']['key']        
       end
  
       def message_body

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

@@ -151,11 +151,13 @@ module MobileWorkflow
     def attachment_url(attachment)
       return nil unless attachment.attached?
     
-      Rails.application.routes.url_helpers.rails_blob_url(attachment, host: attachment_host)
+      Rails.application.routes.url_helpers.rails_blob_url(attachment, host: heroku_attachment_host)
     end
 
-    def attachment_host
-      "https://#{ENV.fetch('HEROKU_APP_NAME')}.herokuapp.com"
+    def heroku_attachment_host
+      # TODO: MBS - move this to a configuration property
+      app_name = Rails.env.test? ? 'test' : ENV.fetch('HEROKU_APP_NAME')
+      "https://#{app_name}.herokuapp.com"
     end
   end
 end

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

@@ -24,10 +24,6 @@ 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/mobile_workflow/tasks/s3.rake

@@ -0,0 +1,12 @@
+desc "Add S3 storage to a Heroku app"
+namespace :mw do
+  task add_heroku_s3_storage: :environment do
+    require 'mobile_workflow/cli'
+    app_name = ENV['APP_NAME']
+    aws_region = ENV['AWS_REGION'] || 'us-east-1'
+    aws = MobileWorkflow::Cli::AwsBackend.new(app_name: app_name, region: aws_region)
+    heroku = MobileWorkflow::Cli::HerokuBackend.new(app_name: app_name)
+    aws.create
+    aws.create_topic_subscription(heroku.notifications_endpoint)
+  end
+end

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.6.31'
+  VERSION = '0.7.3'
   RUBY_VERSION = '2.7.3'
   RAILS_VERSION = '6.1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobile_workflow
 version: !ruby/object:Gem::Version
-  version: 0.6.31
+  version: 0.7.3
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2021-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -116,8 +116,6 @@ 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/lib/tasks/mobile_workflow_s3.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
@@ -138,6 +136,7 @@ files:
 - lib/mobile_workflow/engine.rb
 - lib/mobile_workflow/open_api_spec/parser.rb
 - lib/mobile_workflow/railtie.rb
+- lib/mobile_workflow/tasks/s3.rake
 - lib/mobile_workflow/tasks/set_env.rake
 - lib/mobile_workflow/version.rb
 homepage: https://github.com/futureworkshops/mobile_workflow

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

@@ -1,5 +0,0 @@
-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/lib/tasks/mobile_workflow_s3.rake

@@ -1,10 +0,0 @@
-desc "Add S3 storage to a Heroku app"
-task add_heroku_s3_storage: :environment do
-  require 'mobile_workflow/cli'
-  app_name = ENV['APP_NAME']
-  aws_region = ENV['AWS_REGION'] || 'us-east-1'
-  aws = MobileWorkflow::Cli::AwsBackend.new(app_name: app_name, region: aws_region)
-  heroku = MobileWorkflow::Cli::HerokuBackend.new(app_name: app_name)
-  aws.create
-  aws.create_topic_subscription(heroku.notifications_endpoint)
-end