Merge pull request #12 from cakejelly/rich-content

Adds rich content support

Author: cakejelly

README.md

@@ -123,6 +123,30 @@ conv.destroy
 
 ```
 
+#### Initiating a Rich Content Upload
+
+```ruby
+conv = platform.conversations.find("conversation_id")
+content = conv.content.create(mime_type: "image/png", file: File.open("image.png"))
+# => #<Layer::Resources::RichContent @attributes={...}>
+
+content.upload_url
+# => "https://www.googleapis.com/upload/storage/path/to/content"
+```
+
+#### Refreshing the download URL for a Content Object
+
+```ruby
+content = conv.content.find("content_id")
+# => #<Layer::Resources::RichContent @attributes={...}>
+
+content.download_url
+# => "http://google-testbucket.storage.googleapis.com/some/download/path"
+
+content.refresh_url
+"https://api.layer.com/apps/<APP_ID>/conversations/<CONVERSATION_ID>/content/<CONTENT_ID>"
+```
+
 #### Sending Messages ####
 
 ```ruby

lib/layer/api.rb

@@ -23,5 +23,6 @@
 require "layer/resources/user"
 require "layer/resources/block"
 require "layer/resources/webhook"
+require "layer/resources/rich_content"
 
 require "layer/middleware/api_errors"

lib/layer/http_client.rb

@@ -13,6 +13,7 @@ def connection
       @connection ||= Faraday.new(url: base_url) do |faraday|
         faraday.headers = default_headers
         faraday.request  :url_encoded
+        faraday.request  :multipart
         faraday.adapter  Faraday.default_adapter
         faraday.use Middleware::ApiErrors
       end
@@ -22,6 +23,10 @@ def get(url, options = {})
       call(:get, url, options)
     end
 
+    def put(url, options = {})
+      call(:put, url, options)
+    end
+
     def post(url, options = {})
       call(:post, url, options)
     end

lib/layer/resource_proxy.rb

@@ -1,17 +1,20 @@
 module Layer
   class ResourceProxy
+    attr_accessor :url
+
     def initialize(client, base, resource)
       @client = client
       @base = base
       @resource = resource
+      @url = get_url(base, resource)
     end
 
-    def url
-      @base.nil? ? @resource.url : "#{@base.url}/#{@resource.url}"
+    def get_url(base, resource)
+      base.nil? ? resource.url : "#{base.url}/#{resource.url}"
     end
 
     def method_missing(method, *args, &block)
-      @resource.public_send(method, *([@client, url] + args), &block)
+      @resource.public_send(method, *([@client, @url] + args), &block)
     end
 
     def respond_to_missing?(method, include_private = false)

lib/layer/resources/conversation.rb

@@ -4,6 +4,16 @@ class Conversation < Layer::Resource
       def messages
         Layer::ResourceProxy.new(client, self, Message)
       end
+
+      def content
+        proxy = Layer::ResourceProxy.new(client, self, RichContent)
+        proxy.url = content_url
+        proxy
+      end
+
+      def content_url
+        "conversations/#{uuid}/content"
+      end
     end
   end
 end

lib/layer/resources/rich_content.rb

@@ -0,0 +1,26 @@
+module Layer
+  module Resources
+    class RichContent < Layer::Resource
+      def self.create(client, url, params = {})
+        mime_type = params[:mime_type]
+        file = params[:file]
+
+        headers = {
+          "Upload-Content-Type" => mime_type,
+          "Upload-Content-Length" => file.size.to_s
+        }
+
+        response = client.post(url, body: params.to_json, headers: headers)
+        response.merge!("mime_type" => mime_type)
+
+        new(response, client).upload(file)
+      end
+
+      def upload(file)
+        file_header = { "Content-Length" => file.size.to_s }
+        client.put(upload_url, body: file, headers: file_header)
+        self
+      end
+    end
+  end
+end

spec/layer/fixtures/google_storage.json

@@ -0,0 +1,22 @@
+{
+  "etag": "CODY+uDM2ssCEAE=",
+  "crc32c": "8OJNpw==",
+  "owner": {
+    "entityId": "00b4903a9739f8dce455a6e623e7d62928c6655eeed3047adbdc30f553bcca5c",
+    "entity": "user-00b4903a9739f8dce455a6e623e7d62928c6655eeed3047adbdc30f553bcca5c"
+  },
+  "mediaLink": "https:\/\/www.googleapis.com\/download\/storage\/v1\/b\/content-prod1\/o\/c2fc75ce-2f0e-11e5-a716-4290ac022c3d%2Fb127ccbe-5f95-4d6a-9c01-c1e98e147f4f%2Ffe776bf0-f221-11e5-9ce5-0242ac110083?generation=1458866376060000&alt=media",
+  "md5Hash": "PE3ns7xp6S1lfEewRXFB3A==",
+  "size": "6486",
+  "storageClass": "STANDARD",
+  "updated": "2016-03-25T00:39:36.058Z",
+  "timeCreated": "2016-03-25T00:39:36.058Z",
+  "contentType": "image\/png",
+  "metageneration": "1",
+  "generation": "1458866376060000",
+  "bucket": "content-prod1",
+  "name": "c2fc75ce-2f0e-11e5-a716-4290ac022c3d\/b127ccbe-5f95-4d6a-9c01-c1e98e147f4f\/fe776bf0-f221-11e5-9ce5-0242ac110083",
+  "selfLink": "https:\/\/www.googleapis.com\/storage\/v1\/b\/content-prod1\/o\/c2fc75ce-2f0e-11e5-a716-4290ac022c3d%2Fb127ccbe-5f95-4d6a-9c01-c1e98e147f4f%2Ffe776bf0-f221-11e5-9ce5-0242ac110083",
+  "id": "content-prod1\/c2fc75ce-2f0e-11e5-a716-4290ac022c3d\/b127ccbe-5f95-4d6a-9c01-c1e98e147f4f\/fe776bf0-f221-11e5-9ce5-0242ac110083\/1458866376060000",
+  "kind": "storage#object"
+}

spec/layer/fixtures/image.png

@@ -0,0 +1,5 @@
+{
+  "upload_url": "https:\/\/www.googleapis.com\/upload\/storage\/v1\/b\/content-prod1\/o?uploadType=resumable&name=c2fc75ce-2f0e-11e5-a716-4290ac022c3d\/b127ccbe-5f95-4d6a-9c01-c1e98e147f4f\/fe776bf0-f221-11e5-9ce5-0242ac110083&upload_id=AEnB2UqIp4Lpou_9x_pg4CVFxwl3tA7Tq--6lAjCtqkKe7KL6n98rDn719hUEByn2J8ycOSJp6EPPrq8LBgibGrl5jkJ3f9Qyw",
+  "size": 6486,
+  "id": "layer:\/\/\/content\/fe776bf0-f221-11e5-9ce5-0242ac110083"
+}

spec/layer/fixtures/rich_content.json

@@ -6,21 +6,21 @@
   describe "#new" do
     it "should assign a HttpClient instance" do
       http_client = Layer::Platform::Client.new.client
-      proxy = described_class.new(http_client, nil, nil)
+      proxy = described_class.new(http_client, Layer::Resource, Layer::Resource)
 
       expect(proxy.instance_variable_get("@client")).to eq(http_client)
     end
 
     it "should assign a base resource" do
-      base = Class.new
-      proxy = described_class.new(nil, base, nil)
+      base = Layer::Resource
+      proxy = described_class.new(nil, base, Layer::Resource)
 
       expect(proxy.instance_variable_get("@base")).to eq(base)
     end
 
     it "should assign a target resource" do
-      target = Class.new
-      proxy = described_class.new(nil, nil, target)
+      target = Layer::Resource
+      proxy = described_class.new(nil, Layer::Resource, target)
 
       expect(proxy.instance_variable_get("@resource")).to eq(target)
     end