tessa 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93cafce92a98390762cbd8d7f1d033e7b03e15a1
-  data.tar.gz: ac5791937677c234980abb77e77caec40a7f6898
+  metadata.gz: aa71b4d8f37b7ec9bd2f7f3aeff6c216e5ecc7d3
+  data.tar.gz: 40ed20d8dff97b804bc008f1e5040a2e718c2e41
 SHA512:
-  metadata.gz: d0146024146bcf5204facc53f4abf14df135a2728e8101715630dfa5b8b52634672296fd94e2655922d1bd1aa50aceb788c3428cb2e25f5baa105e1bd8a984ca
-  data.tar.gz: 28c21e8452a61969bba191101298638d1489a163ec4ea1d1be889dd892c7f7cfb91665691ccbbf077d56e62ff59f300467492c9f97c248b7d15f1e977ef767ac
+  metadata.gz: b496921808084403c16b79f967692a5d72a79a1fd92cdb5c5daa31169e39766d34e7883ddd245af7142c2e36a2319ff38184580b4d5502b490c9a3a88d5c4dff
+  data.tar.gz: cdc99adff6059964428e89280843ac338166f8dd6036f1a040fac9a5f73376d50916d027d892d20f1e3173104b78641e6b1e5f485426b44e8c74f3f9252deb93

data/lib/tessa/asset.rb

@@ -11,6 +11,14 @@ module Tessa
     attribute :private_url, String
     attribute :delete_url, String
 
+    def complete!(connection: Tessa.config.connection)
+      Asset.new_from_response connection.patch("/assets/#{id}/completed")
+    end
+
+    def cancel!(connection: Tessa.config.connection)
+      Asset.new_from_response connection.patch("/assets/#{id}/cancelled")
+    end
+
     def self.find(*ids,
                   connection: Tessa.config.connection)
       new_from_response connection.get("/assets/#{ids.join(",")}")

data/lib/tessa/upload.rb

@@ -3,19 +3,10 @@ module Tessa
     include Virtus.model
     extend ResponseFactory
 
-    attribute :success_url, String
-    attribute :cancel_url, String
+    attribute :asset_id, Integer
     attribute :upload_url, String
     attribute :upload_method, String
 
-    def complete!(connection: Tessa.config.connection)
-      Asset.new_from_response connection.patch(success_url)
-    end
-
-    def cancel!(connection: Tessa.config.connection)
-      Asset.new_from_response connection.patch(cancel_url)
-    end
-
     def self.create(connection: Tessa.config.connection,
                     strategy: Tessa.config.strategy,
                     **options)

data/lib/tessa/version.rb

@@ -1,3 +1,3 @@
 module Tessa
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 require 'tessa'
 
+Dir[File.expand_path("../support/*.rb", __FILE__)].each do |file|
+  require file
+end
+
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true

data/spec/support/remote_call_macro.rb

@@ -0,0 +1,42 @@
+RSpec.shared_examples_for "remote call macro" do |method, path, return_type|
+  let(:remote_response) { {} }
+  let(:faraday_stubs) {
+    Faraday::Adapter::Test::Stubs.new do |stub|
+      stub.send(method, path) { |env| [200, {}, remote_response.to_json] }
+    end
+  }
+  let(:connection) { Faraday.new { |f| f.adapter :test, faraday_stubs } }
+  let(:call_args) { { connection: connection } }
+
+  it "calls #{method} method with #{path}" do
+    expect(connection).to receive(method).with(path, any_args).and_call_original
+    call
+  end
+
+  context "with no connection passed" do
+    let(:call_args) { {} }
+
+    it "defaults connection to Tessa.config.connection" do
+      expect(Tessa.config).to receive(:connection).and_return(connection)
+      expect(connection).to receive(method).and_call_original
+      call
+    end
+  end
+
+  context "when response is not successful" do
+    let(:faraday_stubs) {
+      Faraday::Adapter::Test::Stubs.new do |stub|
+        stub.send(method, path) { |env| [422, {}, { "error" => "error" }.to_json] }
+      end
+    }
+
+    it "raises Tessa::RequestFailed" do
+      expect{ call }.to raise_error(Tessa::RequestFailed)
+    end
+  end
+
+  it "returns an instance of #{return_type}" do
+    expect(call).to be_a(return_type)
+  end
+end
+

data/spec/tessa/asset_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Tessa::Asset do
+  subject(:asset) { described_class.new(args) }
   let(:args) {
     {
       id: 123,
@@ -15,8 +16,6 @@ RSpec.describe Tessa::Asset do
 
   describe "#initialize" do
     context "with all arguments" do
-      subject(:asset) { described_class.new(args) }
-
       it "sets id to attribute" do
         expect(asset.id).to eq(args[:id])
       end
@@ -48,6 +47,18 @@ RSpec.describe Tessa::Asset do
     end
   end
 
+  describe "#complete!" do
+    subject(:call) { asset.complete!(call_args) }
+
+    include_examples "remote call macro", :patch, "/assets/123/completed", Tessa::Asset
+  end
+
+  describe "#cancel!" do
+    subject(:call) { asset.cancel!(call_args) }
+
+    include_examples "remote call macro", :patch, "/assets/123/cancelled", Tessa::Asset
+  end
+
   describe "#find" do
     let(:faraday_stubs) {
       Faraday::Adapter::Test::Stubs.new do |stub|

data/spec/tessa/upload_spec.rb

@@ -4,23 +4,14 @@ RSpec.describe Tessa::Upload do
   subject(:upload) { described_class.new(args) }
   let(:args) {
     {
-      success_url: "/success",
-      cancel_url: "/cancel",
       upload_url: "/upload",
       upload_method: "put",
+      asset_id: 123,
     }
   }
 
   describe "#initialize" do
     context "with all arguments" do
-      it "sets success_url to attribute" do
-        expect(upload.success_url).to eq(args[:success_url])
-      end
-
-      it "sets cancel_url to attribute" do
-        expect(upload.cancel_url).to eq(args[:cancel_url])
-      end
-
       it "sets upload_url to attribute" do
         expect(upload.upload_url).to eq(args[:upload_url])
       end
@@ -28,61 +19,11 @@ RSpec.describe Tessa::Upload do
       it "sets upload_method to attribute" do
         expect(upload.upload_method).to eq(args[:upload_method])
       end
-    end
-  end
-
-  shared_examples_for "remote call macro" do |method, path, return_type|
-    let(:remote_response) { {} }
-    let(:faraday_stubs) {
-      Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.send(method, path) { |env| [200, {}, remote_response.to_json] }
-      end
-    }
-    let(:connection) { Faraday.new { |f| f.adapter :test, faraday_stubs } }
-    let(:call_args) { { connection: connection } }
-
-    it "calls #{method} method with #{path}" do
-      expect(connection).to receive(method).with(path, any_args).and_call_original
-      call
-    end
-
-    context "with no connection passed" do
-      let(:call_args) { {} }
-
-      it "defaults connection to Tessa.config.connection" do
-        expect(Tessa.config).to receive(:connection).and_return(connection)
-        expect(connection).to receive(method).and_call_original
-        call
-      end
-    end
 
-    context "when response is not successful" do
-      let(:faraday_stubs) {
-        Faraday::Adapter::Test::Stubs.new do |stub|
-          stub.send(method, path) { |env| [422, {}, { "error" => "error" }.to_json] }
-        end
-      }
-
-      it "raises Tessa::RequestFailed" do
-        expect{ call }.to raise_error(Tessa::RequestFailed)
+      it "sets asset_id to attribute" do
+        expect(upload.asset_id).to eq(args[:asset_id])
       end
     end
-
-    it "returns an instance of #{return_type}" do
-      expect(call).to be_a(return_type)
-    end
-  end
-
-  describe "#complete!" do
-    subject(:call) { upload.complete!(call_args) }
-
-    include_examples "remote call macro", :patch, "/success", Tessa::Asset
-  end
-
-  describe "#cancel!" do
-    subject(:call) { upload.cancel!(call_args) }
-
-    include_examples "remote call macro", :patch, "/cancel", Tessa::Asset
   end
 
   describe "::create" do
@@ -95,8 +36,7 @@ RSpec.describe Tessa::Upload do
 
       it "returns a new object initialized with the response" do
         upload = described_class.create(connection: connection)
-        expect(upload.success_url).to eq(args[:success_url])
-        expect(upload.cancel_url).to eq(args[:cancel_url])
+        expect(upload.asset_id).to eq(args[:asset_id])
         expect(upload.upload_url).to eq(args[:upload_url])
         expect(upload.upload_method).to eq(args[:upload_method])
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tessa
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Justin Powell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -118,6 +118,7 @@ files:
 - lib/tessa/upload.rb
 - lib/tessa/version.rb
 - spec/spec_helper.rb
+- spec/support/remote_call_macro.rb
 - spec/tessa/asset_spec.rb
 - spec/tessa/config_spec.rb
 - spec/tessa/upload_spec.rb
@@ -148,6 +149,7 @@ specification_version: 4
 summary: Manage your assets.
 test_files:
 - spec/spec_helper.rb
+- spec/support/remote_call_macro.rb
 - spec/tessa/asset_spec.rb
 - spec/tessa/config_spec.rb
 - spec/tessa/upload_spec.rb