saviour 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3759ef570763d52959c2939288131c3065fac5018e2abe0465b7098eb2572180
-  data.tar.gz: b5b51017fdc09079ad4c086340d9eba67e66e282ae86cc5d745cc4038ccc5c2f
+  metadata.gz: d28e5f8f325721c27a7f763b9733070cf20e3dce6a9acfa7253249a7995ae51c
+  data.tar.gz: d5d81ed8993b2c848d4746e85bd9686c291dff58d61bd3f7eebbdc7f6099246f
 SHA512:
-  metadata.gz: 56e95d8e497c5c1284fc0bc8e89fc182dcf8b044cc8d100e2925152816dacd4ce45ece02ef3253e75dd424c53d8afb73e44ceaa35f23f93d0c00ef9be7c242ef
-  data.tar.gz: 3477c312dd0f3d630ce43cbefc519f7db74c9b8b9d45c1f6f6b708ee0fb3038642fe8cc4ac220b198b3303d0f5dc55d6b9f3008ac357de2888cfd71ce6fa1295
+  metadata.gz: 7ac2b201f3aad2cdd39cb8092d0becdc9d1833f508971f3a33d1d460a9abf83199d6ed9caab807ec72217191adee0585c5cbb53162d3c87e92d46dd34491fd98
+  data.tar.gz: 6ee49e6b551deadf44596066c96a89bcb0dab781e0d7693b99c9af9687b6584bf8b4da58319ce0917cf12c85010aa83b04ae74262cba96b065d272c3e1148ac2

data/lib/saviour/file.rb

@@ -19,7 +19,8 @@ module Saviour
     end
 
     def read
-      persisted? && Config.storage.read(@persisted_path)
+      return nil unless persisted?
+      Config.storage.read(@persisted_path)
     end
 
     def delete
@@ -30,7 +31,8 @@ module Saviour
     end
 
     def public_url
-      persisted? && Config.storage.public_url(@persisted_path)
+      return nil unless persisted?
+      Config.storage.public_url(@persisted_path)
     end
 
     def ==(another_file)

data/lib/saviour/model.rb

@@ -13,7 +13,7 @@ module Saviour
       end
     end
 
-    def reload
+    def reload(*args)
       self.class.attached_files.each do |attach_as|
         instance_variable_set("@__uploader_#{attach_as}", nil)
       end

data/lib/saviour/version.rb

@@ -1,3 +1,3 @@
 module Saviour
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 end

data/spec/feature/introspection_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "Introspection of attached files" do
+  before { allow(Saviour::Config).to receive(:storage).and_return(Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com")) }
+
+  let(:uploader) {
+    Class.new(Saviour::BaseUploader) do
+      store_dir { "/store/dir" }
+    end
+  }
+
+  let(:uploader_for_version) {
+    Class.new(Saviour::BaseUploader) do
+      store_dir { "/store/dir" }
+
+      process do |contents, filename|
+        [contents, "new_#{filename}"]
+      end
+    end
+  }
+
+  let(:klass) {
+    a = Class.new(Test) { include Saviour::Model }
+    a.attach_file :file, uploader
+    a.attach_file :file_thumb, uploader_for_version, follow: :file
+    a
+  }
+
+  describe "Model.attached_files" do
+    it "includes a mapping of the currently attached files" do
+      expect(klass.attached_files).to eq([:file, :file_thumb])
+    end
+  end
+
+  describe "Model.attached_followers_per_leader" do
+    it "is a hash of attachments and followers" do
+      expect(klass.attached_followers_per_leader).to eq({ file: [:file_thumb] })
+    end
+  end
+end

data/spec/feature/reload_model_spec.rb

@@ -16,7 +16,7 @@ describe "reload model" do
         expect(a.file.exists?).to be_truthy
         expect(b.file.exists?).to be_falsey
 
-        b.reload
+        b.reload(lock: false)
         expect(b.file.exists?).to be_truthy
       end
     end

data/spec/models/file_spec.rb

@@ -204,4 +204,18 @@ describe Saviour::File do
       expect(a).to_not eq b
     end
   end
+
+  describe "#read" do
+    it "returns nil when there's no file persisted" do
+      a = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      expect(a.read).to be_nil
+    end
+  end
+
+  describe "#public_url" do
+    it "returns nil when there's no file persisted" do
+      a = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      expect(a.public_url).to be_nil
+    end
+  end
 end

data/spec/models/model_spec.rb

@@ -9,21 +9,6 @@ describe Saviour do
     }.to raise_error(Saviour::NoActiveRecordDetected)
   end
 
-  describe ".attached_files" do
-    it "includes a mapping of the currently attached files" do
-      uploader = Class.new(Saviour::BaseUploader) do
-        store_dir { "/store/dir" }
-      end
-
-      klass = Class.new(Test) do
-        include Saviour::Model
-        attach_file :file, uploader
-      end
-
-      expect(klass.attached_files).to eq([:file])
-    end
-  end
-
   it "doens't mess with default File constant" do
     # Constant lookup in ruby works by lexical scope, so we can't create classes dynamically like above.
     expect(TestForSaviourFileResolution.new.foo).to be_falsey

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Roger Campos
@@ -190,6 +190,7 @@ files:
 - spec/feature/dirty_spec.rb
 - spec/feature/follow_file_spec.rb
 - spec/feature/halt_processor_spec.rb
+- spec/feature/introspection_spec.rb
 - spec/feature/memory_usage_spec.rb
 - spec/feature/original_assigned_file_is_not_modified_spec.rb
 - spec/feature/persisted_path_spec.rb