saviour 0.3.0 → 0.3.1

data/spec/feature/persisted_path_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe "persisted path" do
+  before { allow(Saviour::Config).to receive(:storage).and_return(Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com")) }
+
+  context "can change the default_path on the uploader and previous instances are not affected" do
+    it do
+      uploader = Class.new(Saviour::BaseUploader) { store_dir { "/store/dir" } }
+      klass = Class.new(Test) { include Saviour::Model }
+      klass.attach_file :file, uploader
+
+      with_test_file("example.xml") do |example|
+        a = klass.create!
+        expect(a.update_attributes(file: example)).to be_truthy
+        expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy
+        expect(File.dirname(a[:file])).to eq "/store/dir"
+
+
+        uploader.class_eval { store_dir { "/another/dir" } }
+
+        with_test_file("camaloon.jpg") do |example_2|
+          b = klass.create!
+          expect(b.update_attributes(file: example_2)).to be_truthy
+
+          expect(Saviour::Config.storage.exists?(b[:file])).to be_truthy
+          expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy
+
+          expect(File.dirname(b[:file])).to eq "/another/dir"
+          expect(File.dirname(a[:file])).to eq "/store/dir"
+        end
+      end
+    end
+  end
+end

data/spec/feature/reload_model_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe "reload model" do
+  before { allow(Saviour::Config).to receive(:storage).and_return(Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com")) }
+
+  context "updates the Saviour::File instance" do
+    it do
+      uploader = Class.new(Saviour::BaseUploader) { store_dir { "/store/dir" } }
+      klass = Class.new(Test) { include Saviour::Model }
+      klass.attach_file :file, uploader
+      a = klass.create!
+      b = klass.find(a.id)
+
+      with_test_file("example.xml") do |example|
+        a.update_attributes! file: example
+        expect(a.file.exists?).to be_truthy
+        expect(b.file.exists?).to be_falsey
+
+        b.reload
+        expect(b.file.exists?).to be_truthy
+      end
+    end
+  end
+end

data/spec/feature/validations_spec.rb

@@ -0,0 +1,178 @@
+require 'spec_helper'
+
+describe "validations saving a new file" 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) {
+      store_dir { "/store/dir" }
+    }
+  }
+
+  let(:base_klass) {
+    a = Class.new(Test) { include Saviour::Model }
+    a.attach_file :file, uploader
+    a
+  }
+
+  it "raises error if used for non existing attachments" do
+    klass = Class.new(base_klass) do
+      attach_validation :does_not_exists, :something
+    end
+    expect { klass.new.valid? }.to raise_error.with_message "There is no attachment defined as 'does_not_exists'"
+  end
+
+  it "fails at block validation" do
+    klass = Class.new(base_klass) do
+      attach_validation(:file) do |contents, _|
+        errors.add(:file, "Cannot start with X") if contents[0] == 'X'
+      end
+    end
+
+    with_test_file("example.xml") do |example|
+      allow(example).to receive(:read).and_return("X-Extra contents for the file")
+      a = klass.new
+      a.file = example
+      expect(a).not_to be_valid
+      expect(a.errors[:file][0]).to eq "Cannot start with X"
+    end
+
+    with_test_file("example.xml") do |example|
+      a = klass.new
+      a.file = example
+      expect(a).to be_valid
+      expect(a.save).to be_truthy
+    end
+  end
+
+
+  it "fails at method validation" do
+    klass = Class.new(base_klass) do
+      attach_validation :file, :check_filesize
+
+      def check_filesize(contents, _)
+        errors.add(:file, "Filesize must be less than 10 bytes") if contents.bytesize >= 10
+      end
+    end
+
+    with_test_file("example.xml") do |example|
+      allow(example).to receive(:read).and_return("1234567890")
+      a = klass.new
+      a.file = example
+      expect(a).not_to be_valid
+      expect(a.errors[:file][0]).to eq "Filesize must be less than 10 bytes"
+    end
+
+    with_test_file("example.xml") do |example|
+      allow(example).to receive(:read).and_return("123456789")
+      a = klass.new
+      a.file = example
+      expect(a).to be_valid
+    end
+  end
+
+  it "combined validatinos" do
+    klass = Class.new(base_klass) do
+      attach_validation :file, :check_filesize
+      attach_validation(:file) do |contents, _|
+        errors.add(:file, "Cannot start with X") if contents[0] == 'X'
+      end
+
+      def check_filesize(contents, _)
+        errors.add(:file, "Filesize must be less than 10 bytes") if contents.bytesize >= 10
+      end
+    end
+
+    with_test_file("example.xml") do |example|
+      allow(example).to receive(:read).and_return("X-Ex")
+      a = klass.new
+      a.file = example
+      expect(a).not_to be_valid
+      expect(a.errors[:file][0]).to eq "Cannot start with X"
+    end
+
+    with_test_file("example.xml") do |example|
+      allow(example).to receive(:read).and_return("Ex too long content")
+      a = klass.new
+      a.file = example
+      expect(a).not_to be_valid
+      expect(a.errors[:file][0]).to eq "Filesize must be less than 10 bytes"
+    end
+
+    # Consistent order
+    with_test_file("example.xml") do |example|
+      allow(example).to receive(:read).and_return("X-Ex too long content")
+      a = klass.new
+      a.file = example
+      expect(a).not_to be_valid
+      expect(a.errors[:file][0]).to eq "Filesize must be less than 10 bytes"
+      expect(a.errors[:file][1]).to eq "Cannot start with X"
+    end
+  end
+
+  it "validates by filename" do
+    klass = Class.new(base_klass) do
+      attach_validation :file, :check_filename
+
+      def check_filename(_, filename)
+        errors.add(:file, "Only .jpg files") unless filename =~ /\.jpg/
+      end
+    end
+
+    with_test_file("example.xml") do |example|
+      allow(example).to receive(:read).and_return("X-Ex")
+      a = klass.new
+      a.file = example
+      expect(a).not_to be_valid
+      expect(a.errors[:file][0]).to eq "Only .jpg files"
+    end
+
+    with_test_file("camaloon.jpg") do |example|
+      allow(example).to receive(:read).and_return("X-Ex")
+      a = klass.new
+      a.file = example
+      expect(a).to be_valid
+    end
+  end
+
+  it "receives the attached_as information" do
+    klass = Class.new(base_klass) do
+      attach_validation :file, :check_filename
+
+      def check_filename(_, _, opts)
+        errors.add(:file, "Received error in #{opts[:attached_as]}")
+      end
+    end
+
+    with_test_file("example.xml") do |example|
+      a = klass.new file: example
+      expect(a).not_to be_valid
+      expect(a.errors[:file][0]).to eq "Received error in file"
+    end
+  end
+
+  context "versions are validated" do
+    let(:uploader) {
+      Class.new(Saviour::BaseUploader) {
+        store_dir { "/store/dir" }
+        version(:thumb)
+      }
+    }
+    let(:klass) {
+      Class.new(base_klass) do
+        attach_validation(:file) do |contents, _, opts|
+          errors.add(:file, "Cannot start with X in version #{opts[:version]}") if contents[0] == 'X'
+        end
+      end
+    }
+
+    it do
+      a = klass.create!
+      a.file.assign Saviour::StringSource.new("correct contents")
+      a.file(:thumb).assign Saviour::StringSource.new("X Incorrect contents")
+
+      expect(a).not_to be_valid
+      expect(a.errors[:file][0]).to eq "Cannot start with X in version thumb"
+    end
+  end
+end

data/spec/feature/versions_spec.rb

@@ -14,7 +14,7 @@ describe "saving a new file" do
   }
 
   let(:klass) {
-    a = Class.new { include Saviour::BasicModel }
+    a = Class.new(Test) { include Saviour::Model }
     a.attach_file :file, uploader
     a
   }
@@ -22,13 +22,9 @@ describe "saving a new file" do
   describe "creation following main file" do
     it do
       with_test_file("example.xml") do |example|
-        a = klass.new
-        a.file = example
-        Saviour::LifeCycle.new(a).save!
-
-        path = a.file(:thumb).persisted_path
-        expect(path).not_to be_nil
-        expect(Saviour::Config.storage.exists?(path)).to be_truthy
+        a = klass.create!
+        expect(a.update_attributes(file: example)).to be_truthy
+        expect(Saviour::Config.storage.exists?(a[:file_thumb])).to be_truthy
       end
     end
   end
@@ -36,16 +32,14 @@ describe "saving a new file" do
   describe "deletion" do
     it do
       with_test_file("example.xml") do |example|
-        a = klass.new
-        a.file = example
-        Saviour::LifeCycle.new(a).save!
-
-        expect(Saviour::Config.storage.exists?(a.file(:thumb).persisted_path)).to be_truthy
-        expect(Saviour::Config.storage.exists?(a.file.persisted_path)).to be_truthy
-
-        Saviour::LifeCycle.new(a).delete!
-        expect(Saviour::Config.storage.exists?(a.file(:thumb).persisted_path)).to be_falsey
-        expect(Saviour::Config.storage.exists?(a.file.persisted_path)).to be_falsey
+        a = klass.create!
+        a.update_attributes(file: example)
+        expect(Saviour::Config.storage.exists?(a[:file_thumb])).to be_truthy
+        expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy
+
+        a.destroy
+        expect(Saviour::Config.storage.exists?(a[:file_thumb])).to be_falsey
+        expect(Saviour::Config.storage.exists?(a[:file])).to be_falsey
       end
     end
   end
@@ -53,18 +47,13 @@ describe "saving a new file" do
   describe "changes following main file" do
     it do
       with_test_file("example.xml") do |example|
-        a = klass.new
-        a.file = example
-        Saviour::LifeCycle.new(a).save!
-        path = a.file(:thumb).persisted_path
-        expect(Saviour::Config.storage.exists?(path)).to be_truthy
+        a = klass.create!
+        expect(a.update_attributes(file: example)).to be_truthy
+        expect(Saviour::Config.storage.exists?(a[:file_thumb])).to be_truthy
 
         with_test_file("camaloon.jpg") do |file|
-          a.file = file
-          Saviour::LifeCycle.new(a).save!
-          path = a.file(:thumb).persisted_path
-
-          expect(Saviour::Config.storage.exists?(path)).to be_truthy
+          a.update_attributes(file: file)
+          expect(Saviour::Config.storage.exists?(a[:file_thumb])).to be_truthy
           file.rewind
           expect(a.file(:thumb).read).to eq file.read
         end
@@ -86,9 +75,8 @@ describe "saving a new file" do
 
     it "#url" do
       with_test_file("example.xml") do |example, name|
-        a = klass.new
-        a.file = example
-        Saviour::LifeCycle.new(a).save!
+        a = klass.create!
+        expect(a.update_attributes(file: example)).to be_truthy
 
         versioned_name = "#{File.basename(name, ".*")}_thumb#{File.extname(name)}"
         expect(a.file(:thumb).url).to eq "http://domain.com/versions/store/dir/#{versioned_name}"
@@ -97,9 +85,8 @@ describe "saving a new file" do
 
     it "#read" do
       with_test_file("text.txt") do |example|
-        a = klass.new
-        a.file = example
-        Saviour::LifeCycle.new(a).save!
+        a = klass.create!
+        a.update_attributes(file: example)
 
         expect(a.file(:thumb).read).to eq "Hello world\n_for_version_thumb"
       end
@@ -107,24 +94,21 @@ describe "saving a new file" do
 
     it "#delete" do
       with_test_file("example.xml") do |example|
-        a = klass.new
-        a.file = example
-        Saviour::LifeCycle.new(a).save!
-        expect(Saviour::Config.storage.exists?(a.file(:thumb).persisted_path)).to be_truthy
-        expect(Saviour::Config.storage.exists?(a.file.persisted_path)).to be_truthy
+        a = klass.create!
+        expect(a.update_attributes(file: example)).to be_truthy
+        expect(Saviour::Config.storage.exists?(a[:file_thumb])).to be_truthy
+        expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy
 
         a.file(:thumb).delete
-
-        expect(Saviour::Config.storage.exists?(a.file(:thumb).persisted_path)).to be_falsey
-        expect(Saviour::Config.storage.exists?(a.file.persisted_path)).to be_truthy
+        expect(Saviour::Config.storage.exists?(a[:file_thumb])).to be_falsey
+        expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy
       end
     end
 
     it "#exists?" do
       with_test_file("example.xml") do |example|
-        a = klass.new
-        a.file = example
-        Saviour::LifeCycle.new(a).save!
+        a = klass.create!
+        expect(a.update_attributes(file: example)).to be_truthy
         expect(a.file(:thumb).exists?).to be_truthy
       end
     end
@@ -133,21 +117,18 @@ describe "saving a new file" do
   describe "assign specific version after first creation" do
     it do
       with_test_file("example.xml") do |example|
-        a = klass.new
-        a.file = example
-        Saviour::LifeCycle.new(a).save!
-
-        thumb_path = a.file(:thumb).persisted_path
-        expect(Saviour::Config.storage.exists?(thumb_path)).to be_truthy
-        expect(thumb_path).to eq "/versions/store/dir/#{File.basename(example, ".*")}_thumb.xml"
+        a = klass.create!
+        expect(a.update_attributes(file: example)).to be_truthy
+        expect(Saviour::Config.storage.exists?(a[:file_thumb])).to be_truthy
+        expect(a[:file_thumb]).to eq "/versions/store/dir/#{File.basename(example, ".*")}_thumb.xml"
 
         with_test_file("camaloon.jpg") do |ex2, filename|
           a.file(:thumb).assign(ex2)
-          Saviour::LifeCycle.new(a).save!
-          thumb_path = a.file(:thumb).persisted_path
 
-          expect(Saviour::Config.storage.exists?(thumb_path)).to be_truthy
-          expect(thumb_path).to eq "/versions/store/dir/#{File.basename(filename, ".*")}.jpg"
+          expect(a.save!).to be_truthy
+
+          expect(Saviour::Config.storage.exists?(a[:file_thumb])).to be_truthy
+          expect(a[:file_thumb]).to eq "/versions/store/dir/#{File.basename(filename, ".*")}.jpg"
         end
       end
     end
@@ -166,23 +147,19 @@ describe "saving a new file" do
 
       it "runs the processors for that version only" do
         with_test_file("example.xml") do |example|
-          a = klass.new
-          a.file = example
-          Saviour::LifeCycle.new(a).save!
-          thumb_path = a.file(:thumb).persisted_path
-
-          expect(Saviour::Config.storage.exists?(thumb_path)).to be_truthy
-          expect(thumb_path).to eq "/versions/store/dir/#{File.basename(example, ".*")}_thumb.xml"
+          a = klass.create!
+          expect(a.update_attributes(file: example)).to be_truthy
+          expect(Saviour::Config.storage.exists?(a[:file_thumb])).to be_truthy
+          expect(a[:file_thumb]).to eq "/versions/store/dir/#{File.basename(example, ".*")}_thumb.xml"
 
           with_test_file("camaloon.jpg") do |ex2, filename|
             a.file(:thumb).assign(ex2)
 
-            Saviour::LifeCycle.new(a).save!
-            thumb_path = a.file(:thumb).persisted_path
+            expect(a.save!).to be_truthy
 
-            expect(Saviour::Config.storage.exists?(thumb_path)).to be_truthy
-            expect(thumb_path).to eq "/versions/store/dir/#{File.basename(filename, ".*")}.jpg"
-            expect(Saviour::Config.storage.read(thumb_path)).to eq "modified_content"
+            expect(Saviour::Config.storage.exists?(a[:file_thumb])).to be_truthy
+            expect(a[:file_thumb]).to eq "/versions/store/dir/#{File.basename(filename, ".*")}.jpg"
+            expect(Saviour::Config.storage.read(a[:file_thumb])).to eq "modified_content"
           end
         end
       end
@@ -191,16 +168,16 @@ describe "saving a new file" do
 
   describe "respects version assignation vs main file assignation on conflict" do
     it do
-      a = klass.new
+      a = klass.create!
 
       with_test_file("example.xml") do |file1, fname1|
         with_test_file("camaloon.jpg") do |file2, fname2|
           a.file.assign(file1)
           a.file(:thumb).assign(file2)
-          Saviour::LifeCycle.new(a).save!
+          a.save!
 
-          expect(a.file.persisted_path).to eq "/store/dir/#{fname1}"
-          expect(a.file(:thumb).persisted_path).to eq "/versions/store/dir/#{fname2}"
+          expect(a[:file]).to eq "/store/dir/#{fname1}"
+          expect(a[:file_thumb]).to eq "/versions/store/dir/#{fname2}"
         end
       end
     end