tessa 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b10fb71b4a6667e71ce7be6c39e6a497a5f6399
-  data.tar.gz: 340818b12c567e206a9a13b3cf3da455b5a927d8
+  metadata.gz: f249bb180317b0210a3ccb8ac00990203ef3b958
+  data.tar.gz: d1977678af1fd84081e3ecc11b67469461c9d0ac
 SHA512:
-  metadata.gz: 07fa141947b98f509ed36f32df7b8d17cb2bf7b416661f1bad7a5da5069b5a32e959ae23ea1b06723bb5d96b951390cded79a49765b483c56011c3ec89654274
-  data.tar.gz: c51f1e24de102066b4d6565fd29ed9f505fc452f50be596987f4f5ef1c6e07d7ef90f259eb34b03f8c3b03851d0d9df32e954db6473eaa2be3ea413e4ac2495d
+  metadata.gz: 6cfbfe4952713a3d56f5f35fe440135f1da9bc41d44e43e2a0db496729a599bf78916b587ea9f4c897765410630755f7ac32442591e8dc365c04f1da96a04caa
+  data.tar.gz: 590c79b194d50cb6e0d5db7399ab8e65ed4b6e47d4bd3396cc3eca03be8b0068e787b6d5185bf1a7ddf29bd159a2e76d5710fb1ff7f70332911c12e57161fd76

data/bin/rspec

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/lib/tessa/asset.rb

@@ -29,6 +29,10 @@ module Tessa
       new_from_response connection.get("/assets/#{ids.join(",")}")
     end
 
+    def self.create(file:, **options)
+      Upload.create(options).upload_file(file)
+    end
+
     def failure?
       false
     end

data/lib/tessa/upload.rb

@@ -7,10 +7,25 @@ module Tessa
     attribute :upload_url, String
     attribute :upload_method, String
 
+    def upload_file(file)
+      if UploadsFile.new(upload: self).(file)
+        asset.complete!
+      else
+        asset.cancel!
+        false
+      end
+    end
+
     def self.create(connection: Tessa.config.connection,
                     strategy: Tessa.config.strategy,
                     **options)
       new_from_response connection.post('/uploads', options.merge(strategy: strategy))
     end
+
+    private def asset
+      Asset.new(id: asset_id)
+    end
   end
 end
+
+require 'tessa/upload/uploads_file'

data/lib/tessa/upload/uploads_file.rb

@@ -0,0 +1,23 @@
+class Tessa::Upload::UploadsFile
+  attr_reader :upload, :connection
+
+  def initialize(upload:, connection: self.class.connection_factory)
+    @upload = upload
+    @connection = connection
+  end
+
+  def call(file)
+    params = { file: Faraday::UploadIO.new(file, "application/octet-stream") }
+    connection
+      .public_send(upload.upload_method, upload.upload_url, params)
+      .success?
+  end
+
+  def self.connection_factory
+    Faraday.new do |conn|
+      conn.request :multipart
+      conn.request :url_encoded
+      conn.adapter Faraday.default_adapter
+    end
+  end
+end

data/lib/tessa/version.rb

@@ -1,3 +1,3 @@
 module Tessa
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/tessa/asset_spec.rb

@@ -143,4 +143,28 @@ RSpec.describe Tessa::Asset do
     end
   end
 
+  describe ".create" do
+    let(:upload) { instance_double(Tessa::Upload) }
+
+    before :each do
+      allow(Tessa::Upload).to receive(:create).and_return(upload)
+      allow(upload).to receive(:upload_file)
+    end
+
+    it "requires a file param" do
+      expect { described_class.create }.to raise_error(ArgumentError)
+      expect { described_class.create(file: "abc") }.to_not raise_error
+    end
+
+    it "creates a new upload" do
+      expect(Tessa::Upload).to receive(:create).with(foo: :bar, baz: :boom).and_return(upload)
+      described_class.create(file: "abc", foo: :bar, baz: :boom)
+    end
+
+    it "uploads the passed file to the upload's URL" do
+      expect(Tessa::Upload).to receive(:create).and_return(upload)
+      expect(upload).to receive(:upload_file).with(:file)
+      described_class.create(file: :file)
+    end
+  end
 end

data/spec/tessa/upload/uploads_file_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+RSpec.describe Tessa::Upload::UploadsFile do
+  describe "#initialize" do
+    it "requires an upload and sets it to attribute" do
+      expect { described_class.new }.to raise_error(ArgumentError)
+      obj = described_class.new(upload: :upload)
+      expect(obj.upload).to eq(:upload)
+    end
+
+    it "optionally takes a connection" do
+      obj = described_class.new(upload: :upload, connection: :conn)
+      expect(obj.connection).to eq(:conn)
+    end
+
+    it "defaults connection to empty Faraday connection" do
+      expect(described_class).to receive(:connection_factory).and_return(:foo)
+      obj = described_class.new(upload: :upload)
+      expect(obj.connection).to eq(:foo)
+    end
+  end
+
+  describe "#call" do
+    let(:upload) {
+      instance_double(
+        Tessa::Upload,
+        upload_url: "http://upload/path?arg=1",
+        upload_method: "post"
+      )
+    }
+    let(:connection) {
+      Faraday.new { |f| f.adapter :test, stubs }
+    }
+    subject(:task) { described_class.new(upload: upload, connection: connection) }
+
+    context "uploads file successfully" do
+      let(:stubs) {
+        Faraday::Adapter::Test::Stubs.new do |stub|
+          stub.post("http://upload/path?arg=1") { |env|
+            [200, {}, '']
+          }
+        end
+      }
+
+      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
+      end
+    end
+
+    context "uploads file successfully" do
+      let(:stubs) {
+        Faraday::Adapter::Test::Stubs.new do |stub|
+          stub.post("http://upload/path?arg=1") { |env|
+            [500, {}, '']
+          }
+        end
+      }
+
+      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
+      end
+    end
+  end
+
+  describe ".connection_factory" do
+    it "returns a new Faraday::Connection with the default adapter and url_encoded and multipart" 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])
+    end
+  end
+
+end

data/spec/tessa/upload_spec.rb

@@ -26,7 +26,52 @@ RSpec.describe Tessa::Upload do
     end
   end
 
-  describe "::create" do
+  describe "#upload_file" do
+    subject(:upload) { described_class.new }
+    let(:task) { instance_double(described_class::UploadsFile) }
+
+    before :each do
+      allow(described_class::UploadsFile).to receive(:new).and_return(task)
+      allow(task).to receive(:call)
+      allow(Tessa::Asset).to receive(:new).and_return(instance_spy(Tessa::Asset))
+    end
+
+    it "initializes UploadsFile with self and passes argument to call" do
+      expect(task).to receive(:call).with(:file)
+      expect(described_class::UploadsFile).to receive(:new).with(upload: upload).and_return(task)
+      upload.upload_file(:file)
+    end
+
+    context "with a successful upload" do
+      before :each do
+        allow(task).to receive(:call).and_return(true)
+      end
+
+      it "updates the asset to complete state and returns asset" do
+        upload.asset_id = 123
+        asset = Tessa::Asset.new(id: 123)
+        expect(Tessa::Asset).to receive(:new).with(id: 123).and_return(asset)
+        expect(asset).to receive(:complete!).and_return(:asset)
+        expect(upload.upload_file(:file)).to eq(:asset)
+      end
+    end
+
+    context "with a failed upload" do
+      before :each do
+        allow(task).to receive(:call).and_return(false)
+      end
+
+      it "updates the asset to canceled state and returns false" do
+        upload.asset_id = 123
+        asset = Tessa::Asset.new(id: 123)
+        expect(Tessa::Asset).to receive(:new).with(id: 123).and_return(asset)
+        expect(asset).to receive(:cancel!).and_return(:asset)
+        expect(upload.upload_file(:file)).to eq(false)
+      end
+    end
+  end
+
+  describe ".create" do
     subject(:call) { described_class.create(call_args) }
 
     include_examples "remote call macro", :post, "/uploads", Tessa::Upload

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tessa
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Justin Powell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -85,7 +85,8 @@ description: Manage your assets.
 email:
 - jpowell@watermark.org
 - tpetticrew@watermark.org
-executables: []
+executables:
+- rspec
 extensions: []
 extra_rdoc_files: []
 files:
@@ -97,6 +98,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/rspec
 - circle.yml
 - lib/tessa.rb
 - lib/tessa/asset.rb
@@ -110,6 +112,7 @@ files:
 - lib/tessa/rack_upload_proxy.rb
 - lib/tessa/response_factory.rb
 - lib/tessa/upload.rb
+- lib/tessa/upload/uploads_file.rb
 - lib/tessa/version.rb
 - lib/tessa/view_helpers.rb
 - spec/spec_helper.rb
@@ -123,6 +126,7 @@ files:
 - spec/tessa/model_field_spec.rb
 - spec/tessa/model_spec.rb
 - spec/tessa/rack_upload_proxy_spec.rb
+- spec/tessa/upload/uploads_file_spec.rb
 - spec/tessa/upload_spec.rb
 - tessa.gemspec
 homepage: https://github.com/watermarkchurch/tessa-client
@@ -161,4 +165,5 @@ test_files:
 - spec/tessa/model_field_spec.rb
 - spec/tessa/model_spec.rb
 - spec/tessa/rack_upload_proxy_spec.rb
+- spec/tessa/upload/uploads_file_spec.rb
 - spec/tessa/upload_spec.rb