Change to new interface

Author: bobjflong

README.md

@@ -175,20 +175,23 @@ conversation.conversation_parts[1].body
 # REPLYING TO CONVERSATIONS
 # User (identified by email) replies with a comment
 intercom.conversations.reply(:id => conversation.id, :type => 'user', :email => '[email protected]', :message_type => 'comment', :body => 'foo')
-# Admin (identified by email) replies with a comment
-intercom.conversations.reply(:id => conversation.id, :type => 'admin', :email => '[email protected]', :message_type => 'comment', :body => 'bar')
+# Admin (identified by id) replies with a comment
+intercom.conversations.reply(:id => conversation.id, :type => 'admin', :admin_id => '123', :message_type => 'comment', :body => 'bar')
 
-# Reply and Open
-intercom.conversations.reply_and_open(:id => conversation.id, :type => 'admin', :email => '[email protected]', :message_type => 'note', :body => 'foo')
+# Open
+intercom.conversations.open(id: conversation.id, admin_id: '123')
 
-# Reply and Close
-intercom.conversations.reply_and_close(:id => conversation.id, :type => 'admin', :email => '[email protected]', :message_type => 'note', :body => 'foo')
+# Close
+intercom.conversations.close(id: conversation.id, admin_id: '123')
 
-# Reply and Assign
-intercom.conversations.reply_and_assign({:id => conversation.id, :type => 'admin', :email => '[email protected]', :message_type => 'note', :body => 'foo'}, assignee_id: admin.id)
+# Assign
+intercom.conversations.assign(id: conversation.id, admin_id: '123', assignee_id: '124')
 
-# Assign without reply
-intercom.conversations.assign({:id => conversation.id }, assignee_id: admin.id)
+# Reply and Open
+intercom.conversations.reply(:id => conversation.id, :type => 'admin', :admin_id => '123', :message_type => 'open', :body => 'bar')
+
+# Reply and Close
+intercom.conversations.reply(:id => conversation.id, :type => 'admin', :admin_id => '123', :message_type => 'close', :body => 'bar')
 
 # MARKING A CONVERSATION AS READ
 intercom.conversations.mark_read(conversation.id)

lib/intercom/service/conversation.rb

@@ -27,20 +27,18 @@ def reply(reply_data)
         collection_class.new.from_response(response)
       end
 
-      def reply_and_open(reply_data)
-        reply reply_data.merge(change_state: 'open')
+      def open(reply_data)
+        reply reply_data.merge(message_type: 'open', type: 'admin')
       end
 
-      def reply_and_close(reply_data)
-        reply reply_data.merge(change_state: 'close')
+      def close(reply_data)
+        reply reply_data.merge(message_type: 'close', type: 'admin')
       end
 
-      def reply_and_assign(reply_data, assignee_id:)
-        reply reply_data.merge(assignee_id: assignee_id)
-      end
-
-      def assign(reply_data, assignee_id:)
-        reply reply_data.merge(message_type: 'assignment', assignee_id: assignee_id)
+      def assign(reply_data)
+        assignee_id = reply_data.fetch(:assignee_id) { fail 'assignee_id is required' }
+        reply reply_data.merge(message_type: 'assignment', assignee_id: assignee_id, type: 'admin')
       end
+    end
   end
 end

spec/unit/intercom/conversation_spec.rb

@@ -18,6 +18,21 @@
     client.conversations.reply(id: '147', type: 'user', body: 'Thanks again', message_type: 'comment', user_id: 'ac4')
   end
 
+  it 'opens a conversation' do
+    client.expects(:post).with('/conversations/147/reply', { type: 'admin', message_type: 'open', conversation_id: '147', admin_id: '123'}).returns(test_conversation)
+    client.conversations.open(id: '147', admin_id: '123')
+  end
+
+  it 'closes a conversation' do
+    client.expects(:post).with('/conversations/147/reply', { type: 'admin', message_type: 'close', conversation_id: '147', admin_id: '123'}).returns(test_conversation)
+    client.conversations.close(id: '147', admin_id: '123')
+  end
+
+  it 'assigns a conversation' do
+    client.expects(:post).with('/conversations/147/reply', { type: 'admin', message_type: 'assignment', conversation_id: '147', admin_id: '123', assignee_id: '124'}).returns(test_conversation)
+    client.conversations.assign(id: '147', admin_id: '123', assignee_id: '124')
+  end
+
   # it "creates a subscription" do
   #   client.expects(:post).with("/subscriptions", {'url' => "http://example.com", 'topics' => ["user.created"]}).returns(test_subscription)
   #   subscription = client.subscriptions.create(:url => "http://example.com", :topics => ["user.created"])