saviour 0.3.1 → 0.4.0

data/spec/models/config_spec.rb

@@ -27,6 +27,26 @@ describe Saviour::Config do
         Thread.new { expect(Saviour::Config.storage).to eq("chuck") }.join
       end
 
+      it "raises correct exception if the main thread is not yet configured" do
+        Thread.main["Saviour::Config"] = nil
+
+        Thread.new {
+          expect { Saviour::Config.storage.anything }.to raise_error(RuntimeError)
+        }.join
+      end
+
+      it "forwards configuration to main thread if not configured" do
+        Thread.main["Saviour::Config"] = nil
+
+        Thread.new {
+          Saviour::Config.storage = 'config_set_on_thread_1'
+
+          Thread.new {
+            expect(Saviour::Config.storage).to eq 'config_set_on_thread_1'
+          }.join
+        }.join
+      end
+
       it "allows per-thread values" do
         Saviour::Config.storage = 12
         Thread.new do

data/spec/models/file_spec.rb

@@ -23,9 +23,13 @@ describe Saviour::File do
     store_dir { "/store/dir" }
   } }
 
-  let(:example_file) { double(read: "some file contents", path: "/my/path") }
+  let(:example_file) { double(read: "some file contents", path: "/my/path", rewind: nil) }
 
-  let(:dummy_class) { Class.new }
+  let(:dummy_class) {
+    klass = Class.new
+    Saviour::Integrator.new(klass, Saviour::PersistenceLayer).setup!
+    klass
+  }
 
   describe "#assign" do
     it "returns the assigned object" do
@@ -54,7 +58,7 @@ describe Saviour::File do
     describe "filename used" do
       it "is extracted from original_filename if possible" do
         file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
-        file.assign(double(read: "contents", original_filename: 'original.jpg', path: "/my/path/my_file.zip"))
+        file.assign(double(read: "contents", original_filename: 'original.jpg', path: "/my/path/my_file.zip", rewind: nil))
         uploader = double
         allow(file).to receive(:uploader).and_return(uploader)
         expect(uploader).to receive(:write).with("contents", "original.jpg")
@@ -63,7 +67,7 @@ describe Saviour::File do
 
       it "is extracted from path if possible" do
         file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
-        file.assign(double(read: "contents", path: "/my/path/my_file.zip"))
+        file.assign(double(read: "contents", path: "/my/path/my_file.zip", rewind: nil))
         uploader = double
         allow(file).to receive(:uploader).and_return(uploader)
         expect(uploader).to receive(:write).with("contents", "my_file.zip")
@@ -72,7 +76,7 @@ describe Saviour::File do
 
       it "is random if cannot be guessed" do
         file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
-        file.assign(double(read: "contents"))
+        file.assign(double(read: "contents", rewind: nil))
         allow(SecureRandom).to receive(:hex).and_return("stubbed-random")
         uploader = double
         allow(file).to receive(:uploader).and_return(uploader)
@@ -84,7 +88,7 @@ describe Saviour::File do
     it "returns the path" do
       object = dummy_class.new
       file = Saviour::File.new(uploader_klass, object, :file)
-      file.assign(double(read: "contents", path: "/my/path/my_file.zip"))
+      file.assign(double(read: "contents", path: "/my/path/my_file.zip", rewind: nil))
       uploader = double
       allow(file).to receive(:uploader).and_return(uploader)
       expect(uploader).to receive(:write).with("contents", "my_file.zip").and_return("/store/dir/my_file.zip")
@@ -104,7 +108,7 @@ describe Saviour::File do
 
     it "is cleared after persisting" do
       file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
-      file.assign(double(read: "contents", path: "/my/path/my_file.zip"))
+      file.assign(double(read: "contents", path: "/my/path/my_file.zip", rewind: nil))
       expect(file).to be_changed
 
       uploader = double

data/spec/models/model_spec.rb

@@ -9,57 +9,10 @@ describe Saviour do
     }.to raise_error(Saviour::NoActiveRecordDetected)
   end
 
-  it "error if column not present" do
-    expect {
-      Class.new(Test) do
-        include Saviour::Model
-
-        attach_file :not_present, Saviour::BaseUploader
-      end
-    }.to raise_error(RuntimeError)
-  end
-
-  context do
-    it "error if column not present on version" do
-      uploader = Class.new(Saviour::BaseUploader) do
-        store_dir { "/store/dir" }
-
-        version(:thumb) do
-          store_dir { "/versions/store/dir" }
-        end
-
-        version(:not_present)
-      end
-
-      expect {
-        Class.new(Test) do
-          include Saviour::Model
-
-          attach_file :file, uploader
-        end
-      }.to raise_error(RuntimeError)
-    end
-  end
-
-  it "does not raise error if table is not present" do
-    allow(Test).to receive(:table_exists?).and_return(false)
-
-    expect {
-      Class.new(Test) do
-        include Saviour::Model
-
-        attach_file :not_present, Saviour::BaseUploader
-      end
-    }.to_not raise_error
-  end
-
   describe ".attached_files" do
-    it "includes a mapping of the currently attached files and their versions" do
+    it "includes a mapping of the currently attached files" do
       uploader = Class.new(Saviour::BaseUploader) do
         store_dir { "/store/dir" }
-
-        version(:thumb)
-        version(:thumb_2)
       end
 
       klass = Class.new(Test) do
@@ -67,39 +20,7 @@ describe Saviour do
         attach_file :file, uploader
       end
 
-      expect(klass.attached_files).to eq({file: [:thumb, :thumb_2]})
-
-      klass2 = Class.new(Test) do
-        include Saviour::Model
-        attach_file :file, Saviour::BaseUploader
-      end
-
-      expect(klass2.attached_files).to eq({file: []})
-    end
-  end
-
-  describe ".attached_files" do
-    it "includes a mapping of the currently attached files and their versions" do
-      uploader = Class.new(Saviour::BaseUploader) do
-        store_dir { "/store/dir" }
-
-        version(:thumb)
-        version(:thumb_2)
-      end
-
-      klass = Class.new(Test) do
-        include Saviour::Model
-        attach_file :file, uploader
-      end
-
-      expect(klass.attached_files).to eq({file: [:thumb, :thumb_2]})
-
-      klass2 = Class.new(Test) do
-        include Saviour::Model
-        attach_file :file, Saviour::BaseUploader
-      end
-
-      expect(klass2.attached_files).to eq({file: []})
+      expect(klass.attached_files).to eq([:file])
     end
   end
 
@@ -111,17 +32,16 @@ describe Saviour do
   it "shares model definitions with subclasses" do
     uploader = Class.new(Saviour::BaseUploader) do
       store_dir { "/store/dir" }
-      version(:thumb)
     end
 
     klass = Class.new(Test) do
       include Saviour::Model
       attach_file :file, uploader
     end
-    expect(klass.attached_files).to eq({file: [:thumb]})
+    expect(klass.attached_files).to eq([:file])
 
     klass2 = Class.new(klass)
-    expect(klass2.attached_files).to eq({file: [:thumb]})
+    expect(klass2.attached_files).to eq([:file])
 
     expect(klass2.new.file).to respond_to :exists?
   end

data/spec/models/url_source_spec.rb

@@ -18,13 +18,6 @@ describe Saviour::UrlSource do
     end
   end
 
-  describe "#path" do
-    it "is extracted from te passed uri" do
-      a = Saviour::UrlSource.new("http://domain.com/path/file.jpg")
-      expect(a.path).to eq "/path/file.jpg"
-    end
-  end
-
   describe "#read" do
     it "fails if the uri cannot be accessed" do
       allow(Net::HTTP).to receive(:get_response).and_return(Net::HTTPNotFound)

metadata

@@ -1,73 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fog-aws
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -155,7 +155,6 @@ files:
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - lib/saviour.rb
-- lib/saviour/attribute_name_calculator.rb
 - lib/saviour/base_uploader.rb
 - lib/saviour/config.rb
 - lib/saviour/file.rb
@@ -167,7 +166,6 @@ files:
 - lib/saviour/s3_storage.rb
 - lib/saviour/source_filename_extractor.rb
 - lib/saviour/string_source.rb
-- lib/saviour/uploader/element.rb
 - lib/saviour/uploader/processors_runner.rb
 - lib/saviour/uploader/store_dir_extractor.rb
 - lib/saviour/url_source.rb
@@ -175,12 +173,14 @@ files:
 - lib/saviour/version.rb
 - saviour.gemspec
 - spec/feature/access_to_model_and_mounted_as_spec.rb
+- spec/feature/allow_overriding_attached_as_method.rb
 - spec/feature/crud_workflows_spec.rb
+- spec/feature/follow_file_spec.rb
 - spec/feature/persisted_path_spec.rb
 - spec/feature/reload_model_spec.rb
+- spec/feature/rewind_source_before_read.rb
+- spec/feature/uploader_declaration.rb
 - spec/feature/validations_spec.rb
-- spec/feature/versions_spec.rb
-- spec/models/attribute_name_calculator_spec.rb
 - spec/models/base_uploader_spec.rb
 - spec/models/config_spec.rb
 - spec/models/file_spec.rb
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: File storage handler following active record model lifecycle

data/lib/saviour/attribute_name_calculator.rb

@@ -1,15 +0,0 @@
-module Saviour
-  class AttributeNameCalculator
-    def initialize(attached_as, version = nil)
-      @attached_as, @version = attached_as, version
-    end
-
-    def name
-      if @version
-        "#{@attached_as}_#{@version}"
-      else
-        @attached_as.to_s
-      end
-    end
-  end
-end

data/lib/saviour/uploader/element.rb

@@ -1,19 +0,0 @@
-module Saviour
-  module Uploader
-    class Element
-      attr_reader :version, :method_or_block
-
-      def initialize(version, method_or_block)
-        @version, @method_or_block = version, method_or_block
-      end
-
-      def versioned?
-        !!@version
-      end
-
-      def block?
-        @method_or_block.respond_to?(:call)
-      end
-    end
-  end
-end

data/spec/feature/versions_spec.rb

@@ -1,185 +0,0 @@
-require 'spec_helper'
-
-describe "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) do
-      store_dir { "/store/dir" }
-
-      version(:thumb) do
-        store_dir { "/versions/store/dir" }
-      end
-    end
-  }
-
-  let(:klass) {
-    a = Class.new(Test) { include Saviour::Model }
-    a.attach_file :file, uploader
-    a
-  }
-
-  describe "creation following main file" do
-    it do
-      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_thumb])).to be_truthy
-      end
-    end
-  end
-
-  describe "deletion" do
-    it do
-      with_test_file("example.xml") do |example|
-        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
-
-  describe "changes following main file" do
-    it do
-      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_thumb])).to be_truthy
-
-        with_test_file("camaloon.jpg") do |file|
-          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
-      end
-    end
-  end
-
-  describe "accessing file features directly" do
-    let(:uploader) {
-      Class.new(Saviour::BaseUploader) do
-        store_dir { "/store/dir" }
-
-        version(:thumb) do
-          store_dir { "/versions/store/dir" }
-          process { |contents, name| ["#{contents}_for_version_thumb", name] }
-        end
-      end
-    }
-
-    it "#url" do
-      with_test_file("example.xml") do |example, name|
-        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}"
-      end
-    end
-
-    it "#read" do
-      with_test_file("text.txt") do |example|
-        a = klass.create!
-        a.update_attributes(file: example)
-
-        expect(a.file(:thumb).read).to eq "Hello world\n_for_version_thumb"
-      end
-    end
-
-    it "#delete" do
-      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_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])).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.create!
-        expect(a.update_attributes(file: example)).to be_truthy
-        expect(a.file(:thumb).exists?).to be_truthy
-      end
-    end
-  end
-
-  describe "assign specific version after first creation" do
-    it do
-      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_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)
-
-          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
-
-    context do
-      let(:uploader) {
-        Class.new(Saviour::BaseUploader) do
-          store_dir { "/store/dir" }
-
-          version(:thumb) do
-            store_dir { "/versions/store/dir" }
-            process { |_, filename| ["modified_content", filename] }
-          end
-        end
-      }
-
-      it "runs the processors for that version only" do
-        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_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)
-
-            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"
-            expect(Saviour::Config.storage.read(a[:file_thumb])).to eq "modified_content"
-          end
-        end
-      end
-    end
-  end
-
-  describe "respects version assignation vs main file assignation on conflict" do
-    it do
-      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)
-          a.save!
-
-          expect(a[:file]).to eq "/store/dir/#{fname1}"
-          expect(a[:file_thumb]).to eq "/versions/store/dir/#{fname2}"
-        end
-      end
-    end
-  end
-end