message_quickly 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f604e06dd4401f13831691fdc04fe12b5575538
-  data.tar.gz: 80c5250d342b41f6a8535c1bbc151aa86bf9fc98
+  metadata.gz: f3941141a3b987cc51445285e7f24801af2f281f
+  data.tar.gz: 583bac20cd4d1dee6ea978455e5de86dd3ae28ce
 SHA512:
-  metadata.gz: 0987525c1b4fa1a6e27cbbed91d9036504867fd928ff17cfd24df3a3384864de8a9be3b9fdb30da69c22542472cee8fdecda9351feb01ec04c094663fd940653
-  data.tar.gz: 21819cc573fc22fa74fdea5015a3a9548cc12b94bbc99877c12af5a9f6abff04654da492dd260077e70567590cf38eba4a83d8c1a19d60d09662cdde1742f7ac
+  metadata.gz: 37fafb514a0b6bc99bdd50fcd7d4886ef6e6906062ec082a5708b352d9e62f6ed95e109ca7a6ebfa35161422ada85268c526e548e90abbaa53a0d6fdb304aa4b
+  data.tar.gz: ee9e975a5d10b0a698bd052033256eaff75b0c9a9377a1d6b1a66c6b452b995550abdaf798f68aef70ffa296d48e76ec35a81c29408477f8c8c27dd6bd35f319

data/lib/message_quickly/callback.rb

@@ -6,6 +6,7 @@ module MessageQuickly
     def initialize(event, json)
       @event ||= event
       @json ||= json
+      self
     end
 
   end

data/lib/message_quickly/callback_parser.rb

@@ -48,7 +48,7 @@ module MessageQuickly
       events = []
       process_entry_json(@json['entry']) do |params|
         WEBHOOK_LOOKUP.keys.each do |key|
-          if params[:messaging][key.to_s]
+          if params[:messaging][key]
             events << WEBHOOK_LOOKUP[key].new(params[:messaging])
             break
           end
@@ -78,7 +78,7 @@ module MessageQuickly
         sender: sender,
         recipient: recipient,
         timestamp: timestamp,
-        messaging: event_json
+        messaging: event_json.deep_symbolize_keys
       }
     end
 

data/lib/message_quickly/messaging/delivery_event.rb

@@ -7,7 +7,12 @@ module MessageQuickly
       attr_reader :mids, :watermark, :seq
 
       def initialize(params = {})
-        initialize_params(params['delivery'])
+        if params.include? :delivery
+          @mids = params[:delivery][:mids]
+          @watermark = params[:delivery][:watermark]
+          @seq = params[:delivery][:seq]
+          params.delete(:delivery)
+        end
         super(params)
       end
 

data/lib/message_quickly/messaging/event.rb

@@ -5,15 +5,10 @@ module MessageQuickly
       attr_reader :entry, :sender, :recipient, :timestamp
 
       def initialize(params = {})
-        @sender = Sender.new(params.delete("sender"))
-        @recipient = Recipient.new(params.delete("recipient"))
-        super(params)
-      end
-
-      protected
-
-      def initialize_params(params)
-        params.each { |key, value| instance_variable_set("@#{key}", value) }
+        params.deep_symbolize_keys!
+        @sender = Sender.new(params.delete(:sender)) if params.include?(:sender)
+        @recipient = Recipient.new(params.delete(:recipient)) if params.include?(:recipient)
+        super
       end
 
     end

data/lib/message_quickly/messaging/message_event.rb

@@ -7,7 +7,13 @@ module MessageQuickly
       attr_reader :mid, :seq, :text, :attachments
 
       def initialize(params = {})
-        initialize_params(params['message'])
+        @attachments = params[:message].delete(:attachments).collect { |attachment_params| Attachment.new(attachment_params) } if params.include?(:message) && params[:message].include?(:attachments)
+        if params.include? :message
+          @mid = params[:message][:mid]
+          @seq = params[:message][:seq]
+          @text = params[:message][:text]
+          params.delete(:message)
+        end
         super(params)
       end
 
@@ -18,7 +24,7 @@ module MessageQuickly
       protected
 
       def initialize_params(params)
-        @attachments = params.delete('attachments').collect { |attachment_params| Attachment.new(attachment_params) } if params['attachments']
+
         super(params)
       end
 

data/lib/message_quickly/messaging/optin_event.rb

@@ -7,7 +7,10 @@ module MessageQuickly
       attr_reader :ref
 
       def initialize(params = {})
-        initialize_params(params['optin'])
+        if params.include? :optin
+          @ref = params[:optin][:ref]
+          params.delete(:optin)
+        end
         super(params)
       end
 

data/lib/message_quickly/messaging/postback_event.rb

@@ -7,7 +7,10 @@ module MessageQuickly
       attr_reader :payload
 
       def initialize(params = {})
-        initialize_params(params['postback'])
+        if params.include? :postback
+          @payload = params[:postback][:payload]
+          params.delete(:postback)
+        end
         super(params)
       end
 

data/lib/message_quickly/version.rb

@@ -1,4 +1,4 @@
 module MessageQuickly
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
   FB_MESSENGER_VERSION = "v2.6"
 end

data/spec/callback_parser_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module MessageQuickly
 
   describe CallbackParser do
-    
+
     context 'with a optin request' do
 
       let(:optin_json) { JSON.parse(File.read("spec/fixtures/optin_request.json")) }
@@ -37,6 +37,18 @@ module MessageQuickly
 
     end
 
+    context 'with a message request with attachment' do
+
+      let(:message_json) { JSON.parse(File.read("spec/fixtures/message_request_with_attachment.json")) }
+
+      subject { CallbackParser.new(message_json) }
+
+      it { expect { |b| subject.parse(&b) }.to yield_with_args(Messaging::MessageEvent) }
+      it { expect(subject.parse).not_to be_empty }
+      it { expect(subject.parse.first.attachments).not_to be_empty }
+
+    end
+
     context 'with a postback request' do
 
       let(:postback_json) { JSON.parse(File.read("spec/fixtures/postback_request.json")) }