saviour 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f139cd5d0f7a94b708562c66d560bd070ad4905
-  data.tar.gz: d1723105df9ab846a9010b7b5eeb8714ab6bcd5f
+  metadata.gz: 319d2711e341ea64600303c886f98cba1d698946
+  data.tar.gz: 2d48a9c86baa03ade58dd34b5932735080120b2c
 SHA512:
-  metadata.gz: bb57633ae2b99c891564f8331f0630c025385f9f9dc644a0e46c5713be2ac08a6102e4e32189918d5c3983acf0d423ec6f9a0edd0eb991ae2e597985a887842f
-  data.tar.gz: 250807a0557c9683d0a4953cd666b8b54d988377367af5e2383ba93dd1ee09a79ffd649b636cc3dc50731611a96512be958de171923790b0019b37feacac671f
+  metadata.gz: 0d49c6f41a7ab74b67e52b99e85e13c6c653c7fce639231835ba9ca1cbd6991213231558505ea9d42be51d0b173226a144d5657779ef36570e3960ad156b4ddb
+  data.tar.gz: 4aad76005e7bb31d153a8e135816ac255cd2e812cd1af00360147c1122c1eba54f296d70f5cd363f139fa858f3fd3c2f6db61c27eff4826a5dfc23afe1833963

data/.travis.yml

@@ -2,16 +2,17 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - 2.4.0
+  - 2.1.10
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
 
 gemfile:
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
+  - gemfiles/5.1.gemfile
 
 addons:
   code_climate:
@@ -22,12 +23,14 @@ after_success:
 
 matrix:
   exclude:
-    # rails 5 requires 2.2+
-    - rvm: 2.1.8
+    # rails 5+ requires 2.2+
+    - rvm: 2.1.10
       gemfile: gemfiles/5.0.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/5.1.gemfile
 
     # Arel support for ruby 2.4 starts in 4.2
-    - rvm: 2.4.0
+    - rvm: 2.4.2
       gemfile: gemfiles/4.0.gemfile
-    - rvm: 2.4.0
+    - rvm: 2.4.2
       gemfile: gemfiles/4.1.gemfile

data/gemfiles/5.1.gemfile

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

data/lib/saviour/file.rb

@@ -29,6 +29,23 @@ module Saviour
       persisted? && Config.storage.public_url(@persisted_path)
     end
 
+    def ==(another_file)
+      return false unless another_file.is_a?(Saviour::File)
+      return false unless another_file.persisted? == persisted?
+
+      if persisted?
+        another_file.persisted_path == persisted_path
+      else
+        another_file.instance_variable_get("@source") == @source
+      end
+    end
+
+    def clone
+      new_file = Saviour::File.new(@uploader_klass, @model, @attached_as)
+      new_file.set_path!(@persisted_path)
+      new_file
+    end
+
     alias_method :url, :public_url
 
     def assign(object)
@@ -39,6 +56,11 @@ module Saviour
 
       @source_data = nil
       @source = object
+
+      if changed? && @model.respond_to?("#{@attached_as}_will_change!")
+        @model.send "#{@attached_as}_will_change!"
+      end
+
       @persisted_path = nil if object
 
       object

data/lib/saviour/version.rb

@@ -1,3 +1,3 @@
 module Saviour
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/feature/dirty_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe "dirty model" do
+  before { allow(Saviour::Config).to receive(:storage).and_return(Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com")) }
+
+  context "provides changes and previous file" 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!
+
+      with_test_file("example.xml") do |xml_file|
+        with_test_file("camaloon.jpg") do |jpg_file|
+          a.update_attributes! file: xml_file
+
+          expect(a.changed_attributes).to eq({})
+
+          expect(a.file.exists?).to be_truthy
+          expect(a.file_changed?).to be_falsey
+          expect(a.file.persisted?).to be_truthy
+
+          a.file = jpg_file
+          expect(a.file.persisted?).to be_falsey
+
+          expect(a.file_changed?).to be_truthy
+          expect(a.file_was).to_not eq(a.file)
+          expect(a.file_was.url).to match /\.xml$/
+          expect(a.file_was.persisted?).to be_truthy
+
+          expect(a.changed_attributes).to include("file" => a.file_was)
+        end
+      end
+    end
+  end
+end

data/spec/models/file_spec.rb

@@ -1,6 +1,12 @@
 require 'spec_helper'
 
 describe Saviour::File do
+  class ComparableStringIO < StringIO
+    def ==(a)
+      a.is_a?(ComparableStringIO) && a.read == read
+    end
+  end
+
   let(:mocked_storage) {
     Class.new {
       def write(content, filename)
@@ -188,4 +194,42 @@ describe Saviour::File do
       expect(file).not_to be_blank
     end
   end
+
+  describe "#clone" do
+    it "returns a cloned instance pointing to the same stored file" do
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      file.set_path! "/path/dummy.jpg"
+
+      new_file = file.clone
+      expect(new_file.persisted_path).to eq "/path/dummy.jpg"
+    end
+  end
+
+  describe "#==" do
+    it "compares by object persisted path if persisted" do
+      a = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      a.set_path! "/path/dummy.jpg"
+
+      b = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      b.set_path! "/path/dummy.jpg"
+
+      expect(a).to eq b
+
+      b.set_path! "/path/dummy2.jpg"
+      expect(a).to_not eq b
+    end
+
+    it "compares by content if not persisted" do
+      a = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      a.assign(ComparableStringIO.new("content"))
+
+      b = Saviour::File.new(uploader_klass, dummy_class.new, :file)
+      b.assign(ComparableStringIO.new("content"))
+
+      expect(a).to eq b
+
+      b.assign(ComparableStringIO.new("another content"))
+      expect(a).to_not eq b
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -154,6 +154,7 @@ files:
 - gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
+- gemfiles/5.1.gemfile
 - lib/saviour.rb
 - lib/saviour/base_uploader.rb
 - lib/saviour/config.rb
@@ -175,6 +176,7 @@ files:
 - 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/dirty_spec.rb
 - spec/feature/follow_file_spec.rb
 - spec/feature/persisted_path_spec.rb
 - spec/feature/reload_model_spec.rb