tessa 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7330e2363eb33ab7cf7d633ff85959ebf4b45587
-  data.tar.gz: 6ab6b9a99baa857d4309a6261fcb4f912cb0ea07
+  metadata.gz: 28f2e67e5941ce5ab317926e7bdf19e485fb185c
+  data.tar.gz: f1ef610302d7f4ab169b2c74fb2221a2e072ca37
 SHA512:
-  metadata.gz: 0c61f52d569422acf00b552d0bb949181673fcab38e74392a564e19380749f81a366e90d39c0586fe0e2e08d96911be5fa4456d87faaf5cfb6fe5a881f604138
-  data.tar.gz: 340143a079e8626cfac95e2f4841faa2b8333741656933da0dd0b24963b814861d25866badb136da1969695d90a5540b177f775029e06ace7139f94aa3436bea
+  metadata.gz: d0361b4bf36f9e308a402c77ad9c1d47aa600037b74b1d5cc0db8734b19d299f2e0ce262fbb085050f788d5cea565742af30f8fa12511b1534bfc7563f7dc553
+  data.tar.gz: 55a1356667f4a7b10d4ac592af9a5218c832e3a943c6935b0110393cd414ad99d0fee721c8236e5bd4e6d8718903b21ea2377090750fbc87e2ee9d14ead3ad3a

data/.ruby-version

@@ -0,0 +1 @@
+2.3.3

data/.travis.yml

@@ -1,9 +1,17 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=a1d1020f21ac7490fa6c577e7718c505a0bc7f13a5e4537ec7ca9f1a594bad07
 before_install: gem update bundler
 language: ruby
 notifications:
   email: false
 rvm:
-  - 2.1.0
-addons:
-  code_climate:
-    repo_token: a1d1020f21ac7490fa6c577e7718c505a0bc7f13a5e4537ec7ca9f1a594bad07
+  - 2.3.3
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+script:
+  - bundle exec rspec
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/README.md

@@ -40,7 +40,7 @@ TODO: Write usage instructions here
   [2]: http://rubygems.org/gems/tessa "Gem Version"
   [3]: https://img.shields.io/travis/watermarkchurch/tessa-client/master.svg?style=flat
   [4]: https://travis-ci.org/watermarkchurch/tessa-client "Build Status"
-  [5]: https://codeclimate.com/github/watermarkchurch/tessa-client/badges/coverage.svg
-  [6]: https://codeclimate.com/github/watermarkchurch/tessa-client "Coverage Status"
-  [7]: https://img.shields.io/codeclimate/github/watermarkchurch/tessa-client.svg?style=flat
-  [8]: https://codeclimate.com/github/watermarkchurch/tessa-client "Code Climate"
+  [5]: https://api.codeclimate.com/v1/badges/14600955bbe143bee625/test_coverage
+  [6]: https://codeclimate.com/github/watermarkchurch/tessa-client/test_coverage "Coverage Status"
+  [7]: https://api.codeclimate.com/v1/badges/14600955bbe143bee625/maintainability
+  [8]: https://codeclimate.com/github/watermarkchurch/tessa-client/maintainability "Code Climate"

data/circle.yml

@@ -1,3 +1,3 @@
 machine:
   ruby:
-    version: 2.2.0
+    version: 2.3.3

data/lib/tessa/model.rb

@@ -48,10 +48,17 @@ module Tessa
         end
       end
 
+      private def reapplying_asset?(field, change_set)
+        additions = change_set.changes.select(&:add?)
+
+        return false if additions.none?
+        return false if change_set.changes.size > additions.size
+
+        additions.all? { |a| field.ids(on: self).include?(a.id) }
+      end
     end
 
     module ClassMethods
-
       def asset(name, args={})
         field = tessa_fields[name] = Field.new(args.merge(name: name))
 
@@ -71,6 +78,9 @@ module Tessa
         dynamic_extensions.send(:define_method, "#{name}=") do |value|
           change_set = field.change_set_for(value)
 
+          # should effectively cause a no-op
+          return if reapplying_asset?(field, change_set)
+
           if !(field.multiple? && value.is_a?(AssetChangeSet))
             new_ids = change_set.scoped_changes.select(&:add?).map(&:id)
             change_set += field.difference_change_set(new_ids, on: self)
@@ -91,8 +101,6 @@ module Tessa
       def inherited(subclass)
         subclass.instance_variable_set(:@tessa_fields, @tessa_fields.dup)
       end
-
     end
-
   end
 end

data/lib/tessa/version.rb

@@ -1,3 +1,3 @@
 module Tessa
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/spec/spec_helper.rb

@@ -1,9 +1,15 @@
 require 'tessa'
+require 'tempfile'
 
 Dir[File.expand_path("../support/*.rb", __FILE__)].each do |file|
   require file
 end
 
+if ENV['SIMPLE_COV'] || ENV['CC_TEST_REPORTER_ID']
+  require 'simplecov'
+  SimpleCov.start
+end
+
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true

data/spec/tessa/model_spec.rb

@@ -241,6 +241,24 @@ RSpec.describe Tessa::Model do
           expect(new_set.scoped_ids).to eq(set.scoped_ids)
         end
 
+        it 'keeps asset when set to existing value' do
+          change_set = Tessa::AssetChangeSet.new(
+            changes: { '999' => { 'action' => 'add' } },
+            scoped_ids: [999]
+          )
+          instance.file = change_set
+          expect(instance.file_id).to eq(999)
+
+          change_set.scoped_ids = [4, 5, 6]
+          instance.file = change_set
+          removals = change_set.changes.select(&:remove?).map(&:id)
+          expect(removals).to_not include(999)
+          expect(instance.file_id).to eq(999)
+
+          instance.file = change_set
+          expect(instance.file_id).to eq(999)
+        end
+
         context "with no remove in change set" do
           it "ensures there is a 'remove' action for previous value" do
             instance.file_id = 2

data/spec/tessa/upload/uploads_file_spec.rb

@@ -43,9 +43,11 @@ RSpec.describe Tessa::Upload::UploadsFile do
       }
 
       it "calls the upload_url with upload_method HTTP method" do
-        file = __FILE__
-        expect(connection).to receive(:post).with("http://upload/path?arg=1", hash_including(:file)).and_call_original
-        expect(task.call(file)).to be_truthy
+        file = Tempfile.new("test")
+        file.write "hello there"
+        file.close
+        expect(connection).to receive(:post).with("http://upload/path?arg=1", "hello there").and_call_original
+        expect(task.call(file.path)).to be_truthy
       end
     end
 
@@ -59,19 +61,21 @@ RSpec.describe Tessa::Upload::UploadsFile do
       }
 
       it "calls the upload_url with upload_method HTTP method" do
-        file = __FILE__
-        expect(connection).to receive(:post).with("http://upload/path?arg=1", hash_including(:file)).and_call_original
-        expect(task.call(file)).to be_falsey
+        file = Tempfile.new("test")
+        file.write "hello there"
+        file.close
+        expect(connection).to receive(:post).with("http://upload/path?arg=1", "hello there").and_call_original
+        expect(task.call(file.path)).to be_falsey
       end
     end
   end
 
   describe ".connection_factory" do
-    it "returns a new Faraday::Connection with the default adapter and url_encoded and multipart" do
+    it "returns a new Faraday::Connection with the default adapter" do
       obj = described_class.connection_factory
       expect(obj).to be_a(Faraday::Connection)
       expect(obj.builder.handlers)
-        .to eq([Faraday::Request::Multipart, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttp])
+        .to eq([Faraday::Adapter::NetHttp])
     end
   end
 

data/tessa.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/watermarkchurch/tessa-client"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = '~> 2.3'
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
@@ -24,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency "simplecov", "~> 0.15.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tessa
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Justin Powell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.1
 description: Manage your assets.
 email:
 - jpowell@watermark.org
@@ -93,6 +107,7 @@ files:
 - ".env.example"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -139,9 +154,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -149,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Manage your assets.