lazy_blob_storage 2.0.0.pre.beta.3 → 2.0.0.pre.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c675223c056ffa300a4910dea9ff45c01ea77c8115d673e530105dc85e7fdc4e
-  data.tar.gz: 54b144adb7025c08c862333874cb2943f84177020fa4b5965003232c8353bb27
+  metadata.gz: 45ca84928e6e354ad7966a97cf15c4d5ab6f93aa952c507f12ab405a30d12310
+  data.tar.gz: 0d4f5893ddb9acfa1631b63177f3951dc178492be3c17781ea661d141d887da9
 SHA512:
-  metadata.gz: a88c198067cdf6ec766b975ee96c3c22553c7b6832491db51cc681d616b9b735abfc1dd02c151a5141bc22ac905a2cdb51fd343f6869328f9179fb2f720e1e6f
-  data.tar.gz: 261c7c6e70daa001281b284edd136ea5551f55ac50173c5ab5c0bd3c471ca192ebf3e4db2c73a55474c49cfa1e1c5adc7b499b93db46902eced3d94b7d7fe2c4
+  metadata.gz: ad52f8ca8bcb8cb31f9a683b96ac88cd2d7ef92e6176affe55ea30d2a28822de2709c59914719b03a2bcde0e015ec80854be9f61b1d99889f7bcc6d3580a93fe
+  data.tar.gz: e0da5bf09d25d351e1cda6edac680efd82b2a18e56bf514f3e82e7e6b13c61ef4eb6be3263ca7b28fb1fc9c01a6865e05828363efd520e35664f0e43ba9c4890

data/README.md

@@ -19,9 +19,9 @@ Don't use this. I mean it.
 
 ## Breaking Changes in 2.0.0-beta.1
 
+- Support UUID key types
 - YOLO support for rails > 6 (it's probably fine)
 - Migrations do not get added to rails paths automatically anymore. They must be copied with the `lazy_blob_storage:install:migrations` rake task.
-- Prefixed most attachment methods with `lazy_` to avoid conflicts.
 - The default max blob size is 100kb. It should probably be lower. You can set this to a number of bytes with `LazyBlobStorage.max_blob_size=`
 - !!! Do not use this for high traffic projects. !!!
 - !!! Do not use this to store big files !!!

data/app/models/concerns/lazy_attachable.rb

@@ -7,7 +7,7 @@ module LazyAttachable
         if (send "#{name}_upload").present? && (send "#{name}_upload_size_ok?")
           blob = LazyBlob.from_upload(send "#{name}_upload")
 
-          if (attached = (send "lazy_attached_#{name}"))
+          if (attached = (send "attached_#{name}"))
             attached.lazy_blob = blob
           else
             attachment = LazyAttachment.new(
@@ -15,7 +15,7 @@ module LazyAttachable
               record: self,
               lazy_blob: blob
             )
-            (send "lazy_attached_#{name}=", attachment)
+            (send "attached_#{name}=", attachment)
           end
         end
       end
@@ -26,22 +26,22 @@ module LazyAttachable
 
       define_method("validate_size_of_#{name}_upload") do
         if (send "#{name}_upload").present? && !(send "#{name}_upload_size_ok?")
-          errors.add("#{name}_upload", "file too large (limit #{(LazyBlobStorage.max_blob_size || LazyBlobStorage.default_max_blob_size) / 1_000} kb")
+          errors.add("#{name}_upload", "file too large (limit #{LazyBlobStorage._max_blob_size / 1_000} kb")
         end
       end
 
-      define_method("lazy_attached_#{name}_path") do
+      define_method("attached_#{name}_path") do
         if (send "#{name}_attached?")
-          digest = (send "lazy_attached_#{name}").digest
+          digest = (send "attached_#{name}").digest
           Rails.application.routes.url_helpers.lazy_blob_path(digest)
         else
           ""
         end
       end
 
-      define_method("lazy_attached_#{name}_url") do
+      define_method("attached_#{name}_url") do
         if (send "#{name}_attached?")
-          digest = (send "lazy_attached_#{name}").digest
+          digest = (send "attached_#{name}").digest
           Rails.application.routes.url_helpers.lazy_blob_url(digest)
         else
           ""
@@ -49,12 +49,12 @@ module LazyAttachable
       end
 
       define_method("#{name}_attached?") do
-        (send "lazy_attached_#{name}").present?
+        (send "attached_#{name}").present?
       end
 
       define_method("handle_#{name}_digest") do
         digest = (send "#{name}_digest").presence
-        attached = (send "lazy_attached_#{name}").presence
+        attached = (send "attached_#{name}").presence
         same_as_attached = (attached && digest) && (attached.digest == digest)
 
         if digest && !same_as_attached
@@ -67,7 +67,7 @@ module LazyAttachable
               digest: digest
             )
 
-            (send "lazy_attached_#{name}=", attachment)
+            (send "attached_#{name}=", attachment)
           end
         end
       end
@@ -80,15 +80,15 @@ module LazyAttachable
       attr_accessor "#{name}_upload"
       attr_accessor "#{name}_digest"
 
-      has_one "lazy_attached_#{name}".to_sym,
+      has_one "attached_#{name}".to_sym,
               -> { where(name: name) },
               class_name: "LazyAttachment",
               as: :record,
               autosave: true,
               dependent: :destroy
 
-      scope "with_lazy_attached_#{name}".to_sym, -> {
-        includes("lazy_attached_#{name}")
+      scope "with_attached_#{name}".to_sym, -> {
+        includes("attached_#{name}")
       }
 
       validate "validate_size_of_#{name}_upload".to_sym

data/app/models/lazy_attachment.rb

@@ -19,4 +19,8 @@ class LazyAttachment < ActiveRecord::Base
   def url
     Rails.application.routes.url_helpers.lazy_blob_url(digest)
   end
+
+  def filename
+    LazyBlob.select(:id, :filename).find(lazy_blob_id).filename
+  end
 end

data/app/models/lazy_blob.rb

@@ -7,9 +7,9 @@ class LazyBlob < ActiveRecord::Base
   validates :content_type, presence: true
   validates :content_length,
             presence: true,
-            numericality: { greater_than: 0, less_than: LazyBlobStorage.max_blob_size || LazyBlobStorage.default_max_blob_size }
+            numericality: { greater_than: 0, less_than: LazyBlobStorage._max_blob_size }
   validates :digest, presence: true, uniqueness: true
-  validates :content, presence: true, length: { maximum: LazyBlobStorage.max_blob_size || LazyBlobStorage.default_max_blob_size }
+  validates :content, presence: true, length: { maximum: LazyBlobStorage._max_blob_size }
 
   def self.from_upload(uploaded_file)
     file = File.open(uploaded_file.tempfile.path, 'rb')

data/db/migrate/20200213161207_create_lazy_blobs.rb

@@ -1,6 +1,9 @@
 class CreateLazyBlobs < ActiveRecord::Migration[6.0]
   def change
-    create_table :lazy_blobs do |t|
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :lazy_blobs, id: primary_key_type do |t|
       t.string :filename
       t.string :content_type
       t.integer :content_length
@@ -9,4 +12,13 @@ class CreateLazyBlobs < ActiveRecord::Migration[6.0]
       t.timestamps
     end
   end
+
+  private
+  def primary_and_foreign_key_types
+    config = Rails.configuration.generators
+    setting = config.options[config.orm][:primary_key_type]
+    primary_key_type = setting || :primary_key
+    foreign_key_type = setting || :bigint
+    [primary_key_type, foreign_key_type]
+  end
 end

data/db/migrate/20200213164215_create_lazy_attachments.rb

@@ -1,11 +1,21 @@
 class CreateLazyAttachments < ActiveRecord::Migration[6.0]
   def change
-    create_table :lazy_attachments do |t|
-      t.references :lazy_blob
-      t.references :record, polymorphic: true
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :lazy_attachments, id: primary_key_type do |t|
+      t.references :lazy_blob, type: foreign_key_type
+      t.references :record, polymorphic: true, type: foreign_key_type
       t.string :name
       t.index :name
       t.timestamps
     end
   end
+
+  def primary_and_foreign_key_types
+    config = Rails.configuration.generators
+    setting = config.options[config.orm][:primary_key_type]
+    primary_key_type = setting || :primary_key
+    foreign_key_type = setting || :bigint
+    [primary_key_type, foreign_key_type]
+  end
 end

data/lib/lazy_blob_storage/version.rb

@@ -1,3 +1,3 @@
 module LazyBlobStorage
-  VERSION = "2.0.0-beta.3"
+  VERSION = "2.0.0-beta.5"
 end

data/lib/lazy_blob_storage.rb

@@ -6,4 +6,8 @@ module LazyBlobStorage
   def self.default_max_blob_size
     100_000.bytes
   end
+
+  def self._max_blob_size
+    max_blob_size || default_max_blob_size
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_blob_storage
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta.3
+  version: 2.0.0.pre.beta.5
 platform: ruby
 authors:
 - Corey Smedstad