saviour 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f06409c24b72526d31e275f0960f5bf754013f3d53497a81a94bef09c574407
-  data.tar.gz: 318b4ab1d8640c87302483853419b03cea9495af7e299c124f3fab8f6be5b8df
+  metadata.gz: f0747dcd299b6f0a1965c583f5f8b71a3c181355f7c98a36e180e5607172af79
+  data.tar.gz: 1aac6b08756d18cd88869e7fa3b25b798a4bc0d543d9ebabe57436ce4edb3f0d
 SHA512:
-  metadata.gz: dcb4f0d8c74ff3d2bf6354c4012f65e5869009a75ca0d23b773156527767b880c2f328de365a6eb8dc5e371f074dedd37785436c545edf6f3fd034971f819acf
-  data.tar.gz: ff1b6c64937fd164ab1bdc1e5e7d76c81d0116c303696c17b86b40f8514b6e9bb58de18b4fa53bcc79f6ec67a991c9878a6db0e396d06f4db2921c5b9fc6c9ad
+  metadata.gz: ca9ce86fa1f80542876bb174b4d74775e66849df6f067a4515fe0634d9936f69ac98b99bcf72a1c29181612a68a322241bf2d2b7f85ddc49f4af97984a0cf7a5
+  data.tar.gz: 2c9c98ae090b2fe969cd4e806cddfad8b86d53738d5096e87d6dd15d75f591148533fb117b6186bfb4a364443d7e774117157676644b9ac194d09a9c07f6413c

data/lib/saviour/integrator.rb

@@ -13,11 +13,11 @@ module Saviour
       @klass.class_attribute :followers_per_leader_config
       @klass.followers_per_leader_config = {}
 
-      klass = @klass
       persistence_klass = @persistence_klass
 
       @klass.define_singleton_method "attach_file" do |attach_as, *maybe_uploader_klass, **opts, &block|
-        klass.attached_files.push(attach_as)
+        self.attached_files += [attach_as]
+
         uploader_klass = maybe_uploader_klass[0]
 
         if opts[:follow]
@@ -27,8 +27,9 @@ module Saviour
             raise(ConfigurationError, "You must specify a :dependent option when using :follow. Use either :destroy or :ignore")
           end
 
-          klass.followers_per_leader_config[opts[:follow]] ||= []
-          klass.followers_per_leader_config[opts[:follow]].push({ attachment: attach_as, dependent: dependent })
+          self.followers_per_leader_config = self.followers_per_leader_config.dup
+          self.followers_per_leader_config[opts[:follow]] ||= []
+          self.followers_per_leader_config[opts[:follow]].push({ attachment: attach_as, dependent: dependent })
         end
 
         if uploader_klass.nil? && block.nil?
@@ -91,7 +92,7 @@ module Saviour
           end
         end
 
-        klass.include mod
+        self.include mod
       end
 
       @klass.define_singleton_method("attached_followers_per_leader") do
@@ -103,13 +104,13 @@ module Saviour
       @klass.class_attribute :__saviour_validations
 
       @klass.define_singleton_method("attach_validation") do |attach_as, method_name = nil, &block|
-        klass.__saviour_validations ||= Hash.new { [] }
-        klass.__saviour_validations[attach_as] += [{ method_or_block: method_name || block, type: :memory }]
+        self.__saviour_validations ||= Hash.new { [] }
+        self.__saviour_validations[attach_as] += [{ method_or_block: method_name || block, type: :memory }]
       end
 
       @klass.define_singleton_method("attach_validation_with_file") do |attach_as, method_name = nil, &block|
-        klass.__saviour_validations ||= Hash.new { [] }
-        klass.__saviour_validations[attach_as] += [{ method_or_block: method_name || block, type: :file }]
+        self.__saviour_validations ||= Hash.new { [] }
+        self.__saviour_validations[attach_as] += [{ method_or_block: method_name || block, type: :file }]
       end
     end
   end

data/lib/saviour/version.rb

@@ -1,3 +1,3 @@
 module Saviour
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

data/spec/models/model_spec.rb

@@ -30,4 +30,53 @@ describe Saviour do
 
     expect(klass2.new.file).to respond_to :exists?
   end
+
+  it "subclasses can have independent attachments" do
+    uploader = Class.new(Saviour::BaseUploader) do
+      store_dir { "/store/dir" }
+    end
+
+    klass = Class.new(Test) do
+      include Saviour::Model
+    end
+    expect(klass.attached_files).to eq([])
+
+    klass2 = Class.new(klass) do
+      attach_file :file, uploader
+    end
+
+    klass3 = Class.new(klass) do
+      attach_file :file_thumb, uploader
+    end
+
+    expect(klass2.attached_files).to eq([:file])
+    expect(klass.attached_files).to eq([])
+    expect(klass3.attached_files).to eq([:file_thumb])
+  end
+
+  it "subclasses can have independent attachments with followers" do
+    uploader = Class.new(Saviour::BaseUploader) do
+      store_dir { "/store/dir" }
+    end
+
+    klass = Class.new(Test) do
+      include Saviour::Model
+    end
+
+    klass2 = Class.new(klass) do
+      attach_file :file, uploader
+      attach_file :file_thumb, uploader, follow: :file, dependent: :destroy
+    end
+
+    klass3 = Class.new(klass) do
+      attach_file :file_thumb_2, uploader
+      attach_file :file_thumb_3, uploader, follow: :file_thumb_2, dependent: :destroy
+    end
+
+    expect(klass2.attached_files).to eq([:file, :file_thumb])
+    expect(klass2.attached_followers_per_leader).to eq({file: [:file_thumb]})
+
+    expect(klass3.attached_files).to eq([:file_thumb_2, :file_thumb_3])
+    expect(klass3.attached_followers_per_leader).to eq({file_thumb_2: [:file_thumb_3]})
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord