tessa 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4842f3250777ed9f020f3096a04782f1e740a7d
-  data.tar.gz: a1984882ebc543a5a0acf098f54b4c081f61b8b0
+  metadata.gz: 7d4243471a3a0dcf4a53293162987585ea1077e9
+  data.tar.gz: 5124637e6f8064d3389b12e9d56f8c5451de28b2
 SHA512:
-  metadata.gz: ed5894431e9139b5440edb4d5cf30ad8c2f4364771953215a4e60089076e615b910be1bbb43616b35f9fa0a62e1b7b3dba893d06f4623dd59bcf6715e0da0db0
-  data.tar.gz: 5c1d7e34c98f0bc52a7bc01354217be0669346d97eeb1f2a71c2dcd5eb37aaecd9ab320d7f13e513dbba370960e65e23bb2062ea5c735823f12b751b012b9824
+  metadata.gz: accbf3e68da83af76335f1b1f64368b3a579141c3e7657cff1a49d2b0418ac90ee422f246f8e18dd7f8584f27e1b0afe7ff1479ab0f3067cb42a92f984b940a2
+  data.tar.gz: a2a7691c6dc45057a2acbcd8996c7ce56b53ea7cc6dbc710be51dfc59ab9197140cea91caaf0792a37f69bb25f8f51a14a5d39ad16421cf7279cbda6a3bdf5f7

data/lib/tessa/controller_helpers.rb

@@ -0,0 +1,16 @@
+module Tessa
+  module ControllerHelpers
+
+    def params_for_asset(changes)
+      Tessa::AssetChangeSet.new(
+        changes: changes,
+        scoped_ids: tessa_upload_asset_ids,
+      )
+    end
+
+    def tessa_upload_asset_ids
+      session[:tessa_upload_asset_ids] ||= []
+    end
+
+  end
+end

data/lib/tessa/rack_upload_proxy.rb

@@ -0,0 +1,32 @@
+module Tessa
+  class RackUploadProxy
+
+    def call(env)
+      params = env['rack.request.form_hash']
+      upload = Tessa::Upload.create(
+        name: params["name"],
+        size: params["size"],
+        mime_type: params["mime_type"],
+      )
+
+      env['rack.session'][:tessa_upload_asset_ids] ||= []
+      env['rack.session'][:tessa_upload_asset_ids] << upload.asset_id
+
+      response = {
+        asset_id: upload.asset_id,
+        upload_url: upload.upload_url,
+        upload_method: upload.upload_method,
+      }
+
+      [200, {"Content-Type" => "application/json"}, [response.to_json]]
+    rescue Tessa::RequestFailed
+      [500, {"Content-Type" => "application/json"}, [{ "error" => "Failed to retreive upload URL" }.to_json]]
+    end
+
+    def self.call(*args)
+      new.call(*args)
+    end
+
+  end
+end
+

data/lib/tessa/version.rb

@@ -1,3 +1,3 @@
 module Tessa
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/tessa.rb

@@ -10,7 +10,9 @@ require "tessa/response_factory"
 require "tessa/asset"
 require "tessa/asset_change"
 require "tessa/asset_change_set"
+require "tessa/controller_helpers"
 require "tessa/model"
+require "tessa/rack_upload_proxy"
 require "tessa/upload"
 
 

data/spec/tessa/controller_helpers_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+RSpec.describe Tessa::ControllerHelpers do
+  let(:controller) {
+    Class.new do
+      attr_writer :session
+
+      def session
+        @session ||= {}
+      end
+
+    end.tap { |c| c.send :include, described_class }
+  }
+  subject(:instance) { controller.new }
+
+  describe "#tessa_upload_asset_ids" do
+    it "returns the value of session[:tessa_upload_asset_ids]" do
+      instance.session = { tessa_upload_asset_ids: :value }
+      expect(instance.tessa_upload_asset_ids).to eq(:value)
+    end
+
+    it "sets and returns session[:tessa_upload_asset_ids] to an empty array if nil" do
+      array = instance.tessa_upload_asset_ids
+      expect(array).to eq([])
+      array << 123
+      expect(instance.tessa_upload_asset_ids).to eq(array)
+    end
+  end
+
+  describe "#params_for_asset" do
+    it "returns a Tessa::AssetChangeSet" do
+      expect(instance.params_for_asset({})).to be_a(Tessa::AssetChangeSet)
+    end
+
+    it "sets the value of changes to the argument passed" do
+      changes = [Tessa::AssetChange.new(id: 1)]
+      expect(instance.params_for_asset(changes).changes).to eq(changes)
+    end
+
+    it "sets the scoped_ids to the value of tessa_upload_asset_ids" do
+      scoped_ids = [1, 2, 3]
+      instance.session[:tessa_upload_asset_ids] = scoped_ids
+      expect(instance.params_for_asset([]).scoped_ids).to eq(scoped_ids)
+    end
+
+    it "ensures a unique array" do
+      scoped_ids = [1]
+      instance.session[:tessa_upload_asset_ids] = scoped_ids
+      set = instance.params_for_asset([])
+      set.scoped_ids << 2
+      expect(scoped_ids).to eq([1])
+    end
+  end
+
+end

data/spec/tessa/rack_upload_proxy_spec.rb

@@ -0,0 +1,126 @@
+require 'spec_helper'
+
+RSpec.describe Tessa::RackUploadProxy do
+  Result = Struct.new(:status, :headers, :body) do
+    def json
+      JSON.parse body.first
+    end
+  end
+
+  subject(:result) { Result.new *described_class.call(env) }
+  let(:env) {
+    {
+      "rack.request.form_hash" => params,
+      "rack.session" => session,
+    }
+  }
+  let(:params) { {} }
+  let(:session) { {} }
+  let(:upload) {
+    Tessa::Upload.new(
+      asset_id: 123,
+      upload_url: "a-url",
+      upload_method: "a-method",
+    )
+  }
+  before do
+    allow(Tessa::Upload).to receive(:create).and_return(upload)
+  end
+
+  shared_examples_for "proper json return" do
+    it "returns asset_id" do
+      expect(result.json['asset_id']).to eq(123)
+    end
+
+    it "returns upload_url" do
+      expect(result.json['upload_url']).to eq("a-url")
+    end
+
+    it "returns upload_method" do
+      expect(result.json['upload_method']).to eq("a-method")
+    end
+
+    it "returns a 200 response" do
+      expect(result.status).to eq(200)
+    end
+
+    it "sets the mime type to application/json" do
+      expect(result.headers).to include("Content-Type" => "application/json")
+    end
+
+    context "when Tessa::Upload.create raises RequestFailed" do
+      before do
+        allow(Tessa::Upload).to receive(:create).and_raise(Tessa::RequestFailed)
+      end
+
+      it "returns a proper 500" do
+        expect(result.status).to eq(500)
+      end
+
+      it "sets the mime type to application/json" do
+        expect(result.headers).to include("Content-Type" => "application/json")
+      end
+
+      it "includes an error message in JSON response" do
+        expect(result.json['error']).to be_truthy
+      end
+    end
+  end
+
+  context "with no params and no session" do
+    it "calls Tessa::Upload.create" do
+      expect(Tessa::Upload).to receive(:create).and_return(upload)
+      result
+    end
+
+    it "pushes the asset_id onto session" do
+      result
+      expect(session[:tessa_upload_asset_ids]).to eq([123])
+    end
+
+    it_behaves_like "proper json return"
+  end
+
+  context "with params" do
+    let(:params) {
+      {
+        "name" => "my-name",
+        "size" => 456,
+        "mime_type" => "plain/text",
+      }
+    }
+
+    it "calls Tessa::Upload.create with 'name'" do
+      expect(Tessa::Upload).to receive(:create).with(hash_including(name: "my-name"))
+      result
+    end
+
+    it "calls Tessa::Upload.create with 'size'" do
+      expect(Tessa::Upload).to receive(:create).with(hash_including(size: 456))
+      result
+    end
+
+    it "calls Tessa::Upload.create with 'mime_type'" do
+      expect(Tessa::Upload).to receive(:create).with(hash_including(mime_type: "plain/text"))
+      result
+    end
+
+    it_behaves_like "proper json return"
+  end
+
+  context "with existing session" do
+    let(:session) {
+      {
+        tessa_upload_asset_ids: [:existing_id],
+      }
+    }
+
+    it "does not remove existing ids" do
+      result
+      expect(session[:tessa_upload_asset_ids]).to eq([:existing_id, 123])
+    end
+
+    it_behaves_like "proper json return"
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tessa
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Justin Powell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -116,8 +116,10 @@ files:
 - lib/tessa/asset_change.rb
 - lib/tessa/asset_change_set.rb
 - lib/tessa/config.rb
+- lib/tessa/controller_helpers.rb
 - lib/tessa/model.rb
 - lib/tessa/model/field.rb
+- lib/tessa/rack_upload_proxy.rb
 - lib/tessa/response_factory.rb
 - lib/tessa/upload.rb
 - lib/tessa/version.rb
@@ -127,8 +129,10 @@ files:
 - spec/tessa/asset_change_spec.rb
 - spec/tessa/asset_spec.rb
 - spec/tessa/config_spec.rb
+- spec/tessa/controller_helpers_spec.rb
 - spec/tessa/model_field_spec.rb
 - spec/tessa/model_spec.rb
+- spec/tessa/rack_upload_proxy_spec.rb
 - spec/tessa/upload_spec.rb
 - tessa.gemspec
 homepage: https://github.com/watermarkchurch/tessa
@@ -162,6 +166,8 @@ test_files:
 - spec/tessa/asset_change_spec.rb
 - spec/tessa/asset_spec.rb
 - spec/tessa/config_spec.rb
+- spec/tessa/controller_helpers_spec.rb
 - spec/tessa/model_field_spec.rb
 - spec/tessa/model_spec.rb
+- spec/tessa/rack_upload_proxy_spec.rb
 - spec/tessa/upload_spec.rb