nochmal 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b70999f48275f14acd8a9d6fe2e04b5cd0c5d7aec648a667456135b088fc65f2
-  data.tar.gz: be84cc7695bc93daa47292eb0fafb57bffa774cef0b45228a3d33d1052754522
+  metadata.gz: 5f9b976eb7a45473b64deeeffcef948ddca95452100b674f5cffaefbb6ff5ede
+  data.tar.gz: 2c1817332f6361fd60b3a7238c49e69b1d9c9bf8a2bde854c773ca1de76087d2
 SHA512:
-  metadata.gz: 9255a50d4a7b0fc7d9cd378eb2515bf5af52e84b7427c946cc1043cf70f61865b54d96d8e462784f32963b99c96992c903a98e9f1eae4a778c07cae9bed1a679
-  data.tar.gz: 17977431f4aaa86a73e228be840cee3ffa4fa44e316acc13eb0745c0cfbbde83d1bc78a17527f940aea1783e34539af6206233d8a5664348f97ce0a3262e347b
+  metadata.gz: 6df5eedb1f79563e6d1fc5931f8e3b07f079ac10e0be06e51c4ef64a7f76c7a22c8ae4c4e51a63e16a00baad22cd2f440e5bdc434683eb6fe6be2668c475b3ca
+  data.tar.gz: bd88f5d4a586dc31223c4ec180b6f4f024a179fc950d85b5c8d1bb8e5c51f1bc7d9c47721a0cdca6cad02e2b1c2ec58870bbee497dd5c45156202657db9dca75

data/lib/nochmal/adapters/base.rb

@@ -66,7 +66,7 @@ module Nochmal
       def type_completed(_model, _type); end
 
       # called after reuploading/listing/counting each record/attachment
-      def item_completed(_item, _type); end
+      def item_completed(_item, _type, _status); end
 
       # actions
 

data/lib/nochmal/adapters/carrierwave_analyze.rb

@@ -11,10 +11,14 @@ module Nochmal
         @variants_present = false
       end
 
+      def to_storage_service(to = @to)
+        @to_storage_service ||= ActiveStorage.new(from: :unused, to: to).to_storage_service
+      end
+
       def attachment_types_for(model)
         @types[model] ||= model.uploaders.map do |uploader, uploader_class|
           @uploaders[model] = { uploader => uploader_class }
-          model.has_one_attached prefixed(uploader), service: @to_storage_service.name
+          model.has_one_attached prefixed(uploader), service: to_storage_service.name
 
           uploader
         end
@@ -35,7 +39,8 @@ module Nochmal
       def general_notes
         [
           display_helper_notes,
-          gemfile_additions
+          gemfile_additions,
+          final_thank_you
         ].join("\n")
       end
 
@@ -149,8 +154,8 @@ module Nochmal
                     pic
                   end
                 end
-              elsif model.respond_to?(:"carrierwave_#{name}") && model.send(:"carrierwave_#{name}")
-                model.send(:"carrierwave_#{name}_url")
+              elsif model.respond_to?(:"carrierwave_\#{name}") && model.send(:"carrierwave_\#{name}")
+                model.send(:"carrierwave_\#{name}_url")
               else
                 upload_default(default)
               end
@@ -160,16 +165,16 @@ module Nochmal
             def upload_name(model, name)
               if model.send(name.to_sym).attached?
                 model.send(name.to_sym).filename.to_s
-              elsif model.respond_to?(:"carrierwave_#{name}_identifier")
-                model.send(:"carrierwave_#{name}_identifier")
+              elsif model.respond_to?(:"carrierwave_\#{name}_identifier")
+                model.send(:"carrierwave_\#{name}_identifier")
               end
             end
 
             def upload_exists?(model, name)
               return true if model.send(name.to_sym).attached?
 
-              if model.respond_to?(:"carrierwave_#{name}")
-                model.send(:"carrierwave_#{name}").present?
+              if model.respond_to?(:"carrierwave_\#{name}")
+                model.send(:"carrierwave_\#{name}").present?
               else
                 false
               end
@@ -180,15 +185,15 @@ module Nochmal
             def upload_variant(model, name, variant, default: model.name.underscore)
               if model.send(name.to_sym).attached?
                 model.send(name.to_sym).variant(variant.to_sym)
-              elsif model.respond_to?(:"carrierwave_#{name}")
-                model.send(:"carrierwave_#{name}").send(variant.to_sym).url
+              elsif model.respond_to?(:"carrierwave_\#{name}")
+                model.send(:"carrierwave_\#{name}").send(variant.to_sym).url
               else
                 upload_default([default, variant].compact.map(&:to_s).join('_'))
               end
             end
 
             def upload_default(png_name = 'profil')
-              ActionController::Base.helpers.asset_pack_path("media/images/#{png_name}.png")
+              ActionController::Base.helpers.asset_pack_path("media/images/\#{png_name}.png")
             end
 
             def extract_image_dimensions(width_x_height)
@@ -201,15 +206,16 @@ module Nochmal
       end
 
       def gemfile_additions
-        variants_dependencies = <<~TEXT
+        variants_dependencies = <<~TEXT.chomp
           gem 'active_storage_variant' # provides person.avatar.variant(:thumb) for Rails < 7
         TEXT
 
-        validation_dependencies = <<~TEXT
+        validation_dependencies = <<~TEXT.chomp
           gem 'active_storage_validations' # validate filesize, dimensions and content-type
         TEXT
 
         <<~TEXT
+          ---------------------------------------------------------
           The following gems are suggested to have in your Gemfile:
 
           gem 'nochmal' # only needed until the migration to the desired ActiveStorage-Backend is complete
@@ -217,6 +223,18 @@ module Nochmal
           #{validation_dependencies}
         TEXT
       end
+
+      def final_thank_you
+        <<~TEXT
+
+          ---------------------------------------------------------
+          Thank you for using "nochmal" today.
+
+          If this is the first thing you read, please read again
+          from the top. :-)
+          ---------------------------------------------------------
+        TEXT
+      end
     end
   end
 end

data/lib/nochmal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nochmal
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nochmal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Thomas Burkhalter