saviour 0.2.3 → 0.3.0

data/spec/models/file_spec.rb

@@ -25,69 +25,35 @@ describe Saviour::File do
 
   let(:example_file) { double(read: "some file contents", path: "/my/path") }
 
-  describe "initialization" do
-    describe "derives persisted from the model" do
-      it do
-        file = Saviour::File.new(uploader_klass, Test.new, :file)
-        expect(file).not_to be_persisted
-      end
-
-      it do
-        file = Saviour::File.new(uploader_klass, Test.create!, :file)
-        expect(file).not_to be_persisted
-      end
-
-      it do
-        file = Saviour::File.new(uploader_klass, Test.create!(file: "/mocked/path"), :file)
-        expect(file).to be_persisted
-      end
-    end
-
-    describe "is not changed" do
-      it do
-        file = Saviour::File.new(uploader_klass, Test.new, :file)
-        expect(file).not_to be_changed
-      end
-
-      it do
-        file = Saviour::File.new(uploader_klass, Test.create!, :file)
-        expect(file).not_to be_changed
-      end
-
-      it do
-        file = Saviour::File.new(uploader_klass, Test.create!(file: "/mocked/path"), :file)
-        expect(file).not_to be_changed
-      end
-    end
-  end
+  let(:dummy_class) { Class.new }
 
   describe "#assign" do
     it "returns the assigned object" do
-      file = Saviour::File.new(uploader_klass, Test.new, :file)
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
       expect(file.assign(example_file)).to eq example_file
     end
 
     it "allows to reset the internal source" do
-      file = Saviour::File.new(uploader_klass, Test.new, :file)
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
       file.assign(example_file)
       expect(file.assign(nil)).to be_nil
     end
 
     it "shows error if assigned object do not respond to :read" do
-      file = Saviour::File.new(uploader_klass, Test.new, :file)
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
       expect { file.assign(6) }.to raise_error(RuntimeError)
     end
   end
 
   describe "#write" do
     it "fails without source" do
-      file = Saviour::File.new(uploader_klass, Test.new, :file)
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
       expect { file.write }.to raise_error(RuntimeError)
     end
 
     describe "filename used" do
       it "is extracted from original_filename if possible" do
-        file = Saviour::File.new(uploader_klass, Test.new, :file)
+        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"))
         uploader = double
         allow(file).to receive(:uploader).and_return(uploader)
@@ -96,7 +62,7 @@ describe Saviour::File do
       end
 
       it "is extracted from path if possible" do
-        file = Saviour::File.new(uploader_klass, Test.new, :file)
+        file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
         file.assign(double(read: "contents", path: "/my/path/my_file.zip"))
         uploader = double
         allow(file).to receive(:uploader).and_return(uploader)
@@ -105,7 +71,7 @@ describe Saviour::File do
       end
 
       it "is random if cannot be guessed" do
-        file = Saviour::File.new(uploader_klass, Test.new, :file)
+        file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
         file.assign(double(read: "contents"))
         allow(SecureRandom).to receive(:hex).and_return("stubbed-random")
         uploader = double
@@ -116,7 +82,7 @@ describe Saviour::File do
     end
 
     it "returns the path" do
-      object = Test.new
+      object = dummy_class.new
       file = Saviour::File.new(uploader_klass, object, :file)
       file.assign(double(read: "contents", path: "/my/path/my_file.zip"))
       uploader = double
@@ -128,7 +94,7 @@ describe Saviour::File do
 
   describe "#changed?" do
     it "is cleared after removing the assignation" do
-      file = Saviour::File.new(uploader_klass, Test.new, :file)
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
       expect(file).not_to be_changed
       file.assign(example_file)
       expect(file).to be_changed
@@ -137,7 +103,7 @@ describe Saviour::File do
     end
 
     it "is cleared after persisting" do
-      file = Saviour::File.new(uploader_klass, Test.new, :file)
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
       file.assign(double(read: "contents", path: "/my/path/my_file.zip"))
       expect(file).to be_changed
 
@@ -152,14 +118,21 @@ describe Saviour::File do
 
   describe "#filename" do
     it "returns the filename of the persisted file" do
-      file = Saviour::File.new(uploader_klass, Test.create!(file: "/mocked/path/file.rar"), :file)
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      file.set_path! "/mocked/path/file.rar"
       expect(file.filename).to eq "file.rar"
     end
+
+    it "returns nil if the file doesn't exist" do
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      expect(file.filename).to be_nil
+    end
   end
 
   describe "#with_copy" do
     it "provides a copy of the stored file" do
-      file = Saviour::File.new(uploader_klass, Test.create!(file: "/mocked/path/file.rar"), :file)
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      file.set_path! "/path/file.jpg"
       allow(file).to receive(:read).and_return("some contents")
 
       file.with_copy do |tmpfile|
@@ -168,15 +141,17 @@ describe Saviour::File do
     end
 
     it "deletes the copied file even on exception" do
-      file = Saviour::File.new(uploader_klass, Test.create!(file: "/mocked/path/file.rar"), :file)
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      file.set_path! "/path/file.jpg"
       allow(file).to receive(:read).and_return("some contents")
+
       mocked_tmpfile = double(binmode: "", rewind: "", flush: "", write: "")
       allow(Tempfile).to receive(:open).and_yield(mocked_tmpfile)
 
       expect(mocked_tmpfile).to receive(:close)
       expect(mocked_tmpfile).to receive(:delete)
 
-      test_exception = Class.new(Exception)
+      test_exception = Class.new(StandardError)
 
       begin
         file.with_copy { |_| raise(test_exception, "some exception within the block") }
@@ -187,23 +162,25 @@ describe Saviour::File do
 
   describe "#blank?" do
     it "it's true when not yet assigned nor persisted" do
-      file = Saviour::File.new(uploader_klass, Test.new, :file)
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
       expect(file).to be_blank
     end
 
-    it "it's true when not yet assigned but persisted" do
-      file = Saviour::File.new(uploader_klass, Test.create!, :file)
-      expect(file).to be_blank
+    it "it's false when not yet assigned but persisted" do
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      file.set_path! "/path/dummy.jpg"
+      expect(file).not_to be_blank
     end
 
     it "it's false when not persisted but assigned" do
-      file = Saviour::File.new(uploader_klass, Test.new, :file)
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
       file.assign example_file
       expect(file).not_to be_blank
     end
 
     it "it's false when persisted and assigned" do
-      file = Saviour::File.new(uploader_klass, Test.create!(file: "/mocked/path/file.rar"), :file)
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      file.set_path! "/path/dummy.jpg"
       expect(file).not_to be_blank
     end
   end

data/spec/models/url_source_spec.rb

@@ -36,18 +36,18 @@ describe Saviour::UrlSource do
     it "retries the request 3 times on error" do
       expect(Net::HTTP).to receive(:get_response).and_return(Net::HTTPNotFound, Net::HTTPNotFound)
       expect(Net::HTTP).to receive(:get_response).and_call_original
-      a = Saviour::UrlSource.new("http://example.com/")
+      a = Saviour::UrlSource.new("http://example.org/")
       expect(a.read.length).to be > 100
     end
 
     it "succeds if the uri is valid" do
-      a = Saviour::UrlSource.new("http://example.com/")
+      a = Saviour::UrlSource.new("http://example.org/")
       expect(a.read.length).to be > 100
     end
 
     it "follows redirects" do
       response = Net::HTTPRedirection.new "1.1", "301", "Redirect"
-      expect(response).to receive(:[]).with("location").and_return("http://example.com")
+      expect(response).to receive(:[]).with("location").and_return("http://example.org")
 
       expect(Net::HTTP).to receive(:get_response).and_return(response)
       expect(Net::HTTP).to receive(:get_response).and_call_original
@@ -58,7 +58,7 @@ describe Saviour::UrlSource do
 
     it "does not follow more than 10 redirects" do
       response = Net::HTTPRedirection.new "1.1", "301", "Redirect"
-      expect(response).to receive(:[]).with("location").exactly(10).times.and_return("http://example.com")
+      expect(response).to receive(:[]).with("location").exactly(10).times.and_return("http://example.org")
       expect(Net::HTTP).to receive(:get_response).exactly(10).times.and_return(response)
 
       expect { Saviour::UrlSource.new("http://faked.blabla").read }.to raise_error(RuntimeError).with_message(/Max number of allowed redirects reached \(10\) when resolving/)
@@ -66,7 +66,7 @@ describe Saviour::UrlSource do
 
     it "fails if the redirected location is not a valid URI" do
       response = Net::HTTPRedirection.new "1.1", "301", "Redirect"
-      expect(response).to receive(:[]).with("location").and_return("http://example.com/%@(&#<<<<")
+      expect(response).to receive(:[]).with("location").and_return("http://example.org/%@(&#<<<<")
 
       expect(Net::HTTP).to receive(:get_response).and_return(response)
 

data/spec/spec_helper.rb

@@ -1,39 +1,11 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 require 'bundler/setup'
 require 'rspec'
-require 'active_record'
-require 'sqlite3'
-require 'logger'
 
 require File.expand_path("../../lib/saviour", __FILE__)
 
-connection_opts = case ENV.fetch('DB', "sqlite")
-                    when "sqlite"
-                      {adapter: "sqlite3", database: ":memory:"}
-                    when "mysql"
-                      {adapter: "mysql2", database: "saviour", username: "root", encoding: "utf8"}
-                    when "postgres"
-                      {adapter: "postgresql", database: "saviour", username: "postgres"}
-                  end
-
-ActiveRecord::Base.establish_connection(connection_opts)
-
-ActiveRecord::Base.logger = Logger.new(STDOUT) if ENV['DEBUG']
-
-def silence_stream(stream)
-  old_stream = stream.dup
-  stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
-  stream.sync = true
-  yield
-ensure
-  stream.reopen(old_stream)
-  old_stream.close
-end
-
-silence_stream(STDOUT) { require 'support/schema' }
-
 require 'support/models'
 
 RSpec.configure do |config|

data/spec/support/models.rb

@@ -1,3 +1,8 @@
-class Test < ActiveRecord::Base
+# Constant lookup in ruby works by lexical scope, so we can't create classes dynamically to test this.
+class TestForSaviourFileResolution
+  include Saviour::BasicModel
 
-end
+  def foo
+    File.file?("/tasdasdasdmp/blabla.txt")
+  end
+end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
@@ -108,34 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: File storage handler following active record model lifecycle
 email:
 - roger@rogercampos.com
@@ -145,49 +89,45 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- Appraisals
+- DECOMPOSE.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/4.0.gemfile
-- gemfiles/4.1.gemfile
-- gemfiles/4.2.gemfile
-- gemfiles/5.0.gemfile
 - lib/saviour.rb
+- lib/saviour/attribute_name_calculator.rb
+- lib/saviour/base_integrator.rb
 - lib/saviour/base_uploader.rb
+- lib/saviour/basic_model.rb
 - lib/saviour/config.rb
 - lib/saviour/file.rb
+- lib/saviour/life_cycle.rb
 - lib/saviour/local_storage.rb
-- lib/saviour/processors/digest.rb
 - 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
+- lib/saviour/utils/class_attribute.rb
 - lib/saviour/version.rb
 - saviour.gemspec
 - spec/feature/access_to_model_and_mounted_as_spec.rb
-- spec/feature/crud_workflows_spec.rb
-- spec/feature/persisted_path_spec.rb
-- spec/feature/reload_model_spec.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/basic_model_spec.rb
 - spec/models/config_spec.rb
 - spec/models/file_spec.rb
 - spec/models/local_storage_spec.rb
-- spec/models/processors/digest_spec.rb
 - spec/models/s3_storage_spec.rb
-- spec/models/saviour_spec.rb
 - spec/models/url_source_spec.rb
 - spec/spec_helper.rb
 - spec/support/data/camaloon.jpg
 - spec/support/data/example.xml
 - spec/support/data/text.txt
 - spec/support/models.rb
-- spec/support/schema.rb
 homepage: https://github.com/rogercampos/saviour
 licenses:
 - MIT
@@ -200,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Appraisals

@@ -1,19 +0,0 @@
-appraise "4.0" do
-  gem "activesupport", "~> 4.0.0"
-  gem "activerecord", "~> 4.0.0"
-end
-
-appraise "4.1" do
-  gem "activesupport", "~> 4.1.0"
-  gem "activerecord", "~> 4.1.0"
-end
-
-appraise "4.2" do
-  gem "activesupport", "~> 4.2.0"
-  gem "activerecord", "~> 4.2.0"
-end
-
-appraise "5.0" do
-  gem "activesupport", "~> 5.0.0"
-  gem "activerecord", "~> 5.0.0"
-end

data/gemfiles/4.0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codeclimate-test-reporter", :group => :test, :require => nil
-gem "activesupport", "~> 4.0.0"
-gem "activerecord", "~> 4.0.0"
-
-gemspec :path => "../"

data/gemfiles/4.1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codeclimate-test-reporter", :group => :test, :require => nil
-gem "activesupport", "~> 4.1.0"
-gem "activerecord", "~> 4.1.0"
-
-gemspec :path => "../"

data/gemfiles/4.2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codeclimate-test-reporter", :group => :test, :require => nil
-gem "activesupport", "~> 4.2.0"
-gem "activerecord", "~> 4.2.0"
-
-gemspec :path => "../"

data/gemfiles/5.0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codeclimate-test-reporter", :group => :test, :require => nil
-gem "activesupport", "~> 5.0.0"
-gem "activerecord", "~> 5.0.0"
-
-gemspec :path => "../"

data/lib/saviour/processors/digest.rb

@@ -1,16 +0,0 @@
-module Saviour
-  module Processors
-    module Digest
-      def digest_filename(contents, filename, opts = {})
-        separator = opts.fetch(:separator, "-")
-
-        digest = ::Digest::MD5.hexdigest(contents)
-        extension = ::File.extname(filename)
-
-        new_filename = "#{[::File.basename(filename, ".*"), digest].join(separator)}#{extension}"
-
-        [contents, new_filename]
-      end
-    end
-  end
-end

data/spec/feature/crud_workflows_spec.rb

@@ -1,143 +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) {
-      store_dir { "/store/dir" }
-    }
-  }
-
-  let(:klass) {
-    a = Class.new(Test) { include Saviour }
-    a.attach_file :file, uploader
-    a
-  }
-
-  describe "creation" do
-    it do
-      with_test_file("example.xml") do |example|
-        a = klass.create!
-        expect(a.update_attributes(file: example)).to be_truthy
-      end
-    end
-
-    it do
-      with_test_file("example.xml") do |example|
-        a = klass.create!
-        a.update_attributes(file: example)
-
-        expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy
-      end
-    end
-
-    it do
-      with_test_file("example.xml") do |example, real_filename|
-        a = klass.create!
-        a.update_attributes(file: example)
-        expect(a[:file]).to eq "/store/dir/#{real_filename}"
-      end
-    end
-
-    it do
-      with_test_file("example.xml") do |example|
-        a = klass.create!
-        a.update_attributes(file: example)
-
-        example.rewind
-        expect(a.file.read).to eq example.read
-      end
-    end
-
-    it do
-      with_test_file("example.xml") do |example|
-        a = klass.create!
-        a.update_attributes(file: example)
-
-        expect(a.file.exists?).to be_truthy
-      end
-    end
-
-    it do
-      with_test_file("example.xml") do |example, real_filename|
-        a = klass.create!
-        a.update_attributes(file: example)
-
-        expect(a.file.filename).to eq real_filename
-      end
-    end
-
-    it do
-      with_test_file("example.xml") do |example, real_filename|
-        a = klass.create!
-        a.update_attributes(file: example)
-
-        expect(a.file.url).to eq "http://domain.com/store/dir/#{real_filename}"
-        expect(a.file.public_url).to eq a.file.url
-      end
-    end
-
-    it "don't create anything if save do not completes (halt during before_save)" do
-      klass = Class.new(Test) do
-        attr_accessor :fail_at_save
-        before_save {
-          if ActiveRecord.version >= Gem::Version.new("5.0")
-            throw(:abort) if fail_at_save
-          else
-            !fail_at_save
-          end
-        }
-        include Saviour
-      end
-      klass.attach_file :file, uploader
-
-      expect {
-        a = klass.new
-        a.fail_at_save = true
-        a.save!
-      }.to raise_error(ActiveRecord::RecordNotSaved)
-
-      with_test_file("example.xml") do |example, _|
-        a = klass.new
-        a.fail_at_save = true
-        a.file = example
-
-        expect(Saviour::Config.storage).not_to receive(:write)
-        a.save
-      end
-    end
-  end
-
-  describe "deletion" do
-    it do
-      with_test_file("example.xml") do |example|
-        a = klass.create!
-        a.update_attributes(file: example)
-        expect(a.file.exists?).to be_truthy
-        expect(a.destroy).to be_truthy
-
-        expect(Saviour::Config.storage.exists?(a[:file])).to be_falsey
-      end
-    end
-  end
-
-  describe "updating" 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])).to be_truthy
-        previous_location = a[:file]
-
-        with_test_file("camaloon.jpg") do |example_2|
-          a.update_attributes(file: example_2)
-          expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy
-
-          expect(Saviour::Config.storage.exists?(previous_location)).to be_falsey
-        end
-      end
-    end
-  end
-end