skype_bot 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a3954eba8aaa3cdc521406483de0600dd0060e2
-  data.tar.gz: 8c3fbef6e765659bbd78ecad72b0003c86ba7215
+  metadata.gz: be11f4eed2038e56a193d9f3b865b39dc5622a3e
+  data.tar.gz: 6f64927b9332620502acb07eb060bf2888f63e96
 SHA512:
-  metadata.gz: a3c8959f866ac3432266b1bb0768aa626e08e960039e63aaff35b8e1956cf14c58890495afd3c09211ca9ee0dc811a92c41253b5db2c5babbe6b5ea0089dd15e
-  data.tar.gz: ba37f46699b72aa4d5dc4db293a13f3fc739d81fa0464e82b953313030584e4fc6d18335360b466641cad5a615eab4d6e857d0bd5a1357e068b7afa8bf326d82
+  metadata.gz: 8cf3a5bbbeb045def4a39a6e11a00e74fb6a0e2d7b94ef5ac95c47ecda07f3773c8d8061c3bae323c005040d7034c12dc722002b9d5ea9581a40e00d37bb6367
+  data.tar.gz: c0c85469799ba41b645f8a1e6520eda958b39ed16f3a2d939badc12f471ed9d88515a08590e07ccbb1c13f26b3979cf1b9156f8d26c97aebfcb4583d0ae7d7a4

data/lib/skype_bot.rb

@@ -2,6 +2,7 @@ require 'typhoeus'
 
 require 'skype_bot/card'
 require 'skype_bot/activity'
+require 'skype_bot/uri'
 require 'skype_bot/auth'
 require 'skype_bot/config'
 require 'skype_bot/parser'
@@ -14,12 +15,12 @@ module SkypeBot
     yield(Config) if block_given?
   end
 
-  def message(uid, content)
-    Activity.new(uid).sent(content)
+  def message(event, content)
+    Activity.new(event).sent(content)
   end
 
-  def card(format, uid, payload)
-    Card.call(format, uid, payload)
+  def card(event, format, payload)
+    Card.call(event, format, payload)
   end
 
   def parser(data)

data/lib/skype_bot/activity.rb

@@ -1,36 +1,36 @@
 module SkypeBot
   class Activity
-    CONVERSATION_URL = 'https://skype.botframework.com/v3/conversations'
+    attr_accessor :event
 
-    attr_accessor :uid
-
-    def initialize(uid)
-      @uid = uid
+    def initialize(event)
+      @event = event
     end
 
     def sent(content)
       token = Auth.get_token
       body = payload(content).to_json
       headers = { Authorization: "Bearer #{token}", 'Content-Type': 'application/json' }
-
       Typhoeus.post(activity_url, body: body, headers: headers)
     end
 
     private
 
     def activity_url
-      "#{CONVERSATION_URL}/#{uid}/activities"
+      end_point = Uri.join(event['service_url'], Config.conversation_path, event['conversation_id'], Config.activity_path)
+
+      if event['id'].present? && event['channel_id'] != 'skype'
+        end_point + '/' + event['id']
+      else
+        end_point
+      end
     end
 
     def payload(content)
       {
         type: 'message',
-        agent: 'botbuilder',
-        source: 'skype',
         text: content,
-        from: { id: "#{Config.skype_number}:#{Config.app_id}" },
-        recipient: { id: uid },
-        channelData: {}
+        from: { id: event['to'], name: event['bot_name'] },
+        recipient: { id: event['from'] }
       }
     end
   end

data/lib/skype_bot/card.rb

@@ -7,8 +7,8 @@ module SkypeBot
   module Card
     extend self
 
-    def call(format, uid, payload)
-      Cards.const_get(format.to_s.classify).new(uid).sent(payload)
+    def call(format, event, payload)
+      Cards.const_get(format.to_s.classify).new(event).sent(payload)
     end
   end
 end

data/lib/skype_bot/cards/base.rb

@@ -1,12 +1,10 @@
 module SkypeBot
   module Cards
     class Base
-      CONVERSATION_URL = 'https://skype.botframework.com/v3/conversations'
+      attr_accessor :event
 
-      attr_accessor :uid
-
-      def initialize(uid)
-        @uid = uid
+      def initialize(event)
+        @event = event
       end
 
       def sent(data)
@@ -19,21 +17,20 @@ module SkypeBot
       end
 
       def activity_url
-        "#{CONVERSATION_URL}/#{uid}/activities"
+        end_point = Uri.join(event['service_url'], Config.conversation_path, event['conversation_id'], Config.activity_path)
+
+        if event['id'].present? && event['channel_id'] != 'skype'
+          end_point + '/' + event['id']
+        else
+          end_point
+        end
       end
 
       def payload(attachments)
         {
           type: 'message',
-          agent: 'botbuilder',
-          source: 'skype',
-          address: {
-            channelId: 'skype',
-            user: { id: uid },
-            bot: { id: "#{Config.skype_number}:#{Config.app_id}" },
-            serviceUrl: 'https://skype.botframework.com',
-            useAuth: true
-          },
+          from: { id: event['to'], name: event['bot_name'] },
+          recipient: { id: event['from'] },
           textFormat: 'xml',
           attachments: attachments
         }

data/lib/skype_bot/cards/carousel.rb

@@ -5,15 +5,8 @@ module SkypeBot
       def payload(attachments)
         {
           type: 'message',
-          agent: 'botbuilder',
-          source: 'skype',
-          address: {
-            channelId: 'skype',
-            user: { id: uid },
-            bot: { id: "#{Config.skype_number}:#{Config.app_id}" },
-            serviceUrl: 'https://skype.botframework.com',
-            useAuth: true
-          },
+          from: { id: event['to'], name: event['bot_name'] },
+          recipient: { id: event['from'] },
           textFormat: 'xml',
           attachmentLayout: 'carousel',
           attachments: attachments

data/lib/skype_bot/config.rb

@@ -8,5 +8,11 @@ module SkypeBot
 
     mattr_accessor :scope
     @@scope = 'https://graph.microsoft.com/.default'
+
+    mattr_accessor :conversation_path
+    @@conversation_path = '/v3/conversations'
+
+    mattr_accessor :activity_path
+    @@activity_path = '/activities'
   end
 end

data/lib/skype_bot/parser.rb

@@ -8,12 +8,17 @@ module SkypeBot
 
     def execute
       {
+        id: payload['id'],
         type: payload['type'].underscore,
         from: payload['from']['id'],
         display_name: payload['from']['name'],
         to: payload['recipient']['id'],
         time: Time.parse(payload['timestamp']),
-        content: payload['text']
+        content: payload['text'],
+        service_url: payload['serviceUrl'],
+        channel_id: payload['channelId'],
+        conversation_id: payload['conversation']['id'],
+        bot_name: payload['recipient']['name']
       }
     end
   end

data/lib/skype_bot/uri.rb

@@ -0,0 +1,9 @@
+module SkypeBot
+  module Uri
+    module_function
+
+    def join(*parts)
+      parts.join('/').gsub(/(?<!\:\/)\/(?!\/)/, '/')
+    end
+  end
+end

data/lib/skype_bot/version.rb

@@ -1,3 +1,3 @@
 module SkypeBot
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skype_bot
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - MQuy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,7 @@ files:
 - lib/skype_bot/cards/sign_in.rb
 - lib/skype_bot/config.rb
 - lib/skype_bot/parser.rb
+- lib/skype_bot/uri.rb
 - lib/skype_bot/version.rb
 - skype_bot.gemspec
 homepage: https://github.com/Coffa/skype_bot