google-api-fcm 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b18c9a80aa74c0d84ef9122db088c44376997f8
-  data.tar.gz: 928de98bc4e05954c0f8f677a6565e90dc13a07a
+  metadata.gz: 9c41545a43261ed60e68c85cffcc631e272acc40
+  data.tar.gz: 0a088f1d1ca1866c3277e56ce4603e4f7edc22ce
 SHA512:
-  metadata.gz: daebfd873171266fefdddfae7f6f8fccae129f3cc90ae8543c2dddb464235010df6e5fce305e9ff87e4d619a01d989fb2dfbc5a7399d9e49f781fc822aa61e6f
-  data.tar.gz: 465dee724fb85f6b6d4a4f62ecbd30953b27385ffd7a0e24b28ec042457d3854b93480c74cde0e0a052224abe74f3ad9bfc21c8a528a3fe0cf8ee0deebe119bd
+  metadata.gz: f107b12f24ab8578cf31cc06e84d98839e54807d9e3dcead3033373d2bf6cf032c10ff98a19fd14e06bf097fd61851cef63e11ef82e5a34a9a218994fd862eea
+  data.tar.gz: 5127a792147c8336861365b1b3127737e6a7ebbd974ad0c87f8cd5bb3b7a3ca960b7d16827b5558a4bce949ac2858d284b94ca48cd9d0a11e15238849d32524e

data/lib/google/apis/messages/classes.rb

@@ -1,30 +1,40 @@
 module Google
   module Apis
     module Messages
-
       class Message
         include Google::Apis::Core::Hashable
 
         attr_accessor :message_object
 
         def initialize(**args)
-          build_keys = %i(topic title body)
+          update!(**args)
+        end
 
-          if (build_keys - args.keys).empty?
-            initialize_build(**args)
-          else
-            update!(**args)
-          end
+        def initialize_build(**args)
+          notification = Notification.new(
+            title: args[:notification][:title],
+            body: args[:notification][:body]
+          )
 
-        end
+          message_object_args = {
+            topic: args[:topic],
+            notification: notification,
+            data: args[:payload]
+          }
+
+          if args.key?(:webpush) && args[:webpush][:icon]
+            message_object_args[:webpush] = Webpush.new(args[:webpush])
+          end
 
-        def initialize_build(topic:, title:, body:, payload: nil)
-          notification = Notification.new(title: title, body: body)
-          @message_object = MessageObject.new(topic: topic, notification: notification, data: payload)
+          @message_object = MessageObject.new(message_object_args)
         end
 
         def update!(**args)
-          @message_object = args[:message_object] if args.key?(:message_object)
+          if args.key?(:message_object)
+            @message_object = args[:message_object]
+          else
+            initialize_build(**args)
+          end
         end
       end
 
@@ -34,6 +44,7 @@ module Google
         attr_accessor :topic
         attr_accessor :notification
         attr_accessor :data
+        attr_accessor :webpush
 
         def initialize(**args)
           update!(**args)
@@ -44,13 +55,9 @@ module Google
           @topic = args[:topic] if args.key?(:topic)
           @notification = args[:notification] if args.key?(:notification)
           if args.key?(:data) && args[:data].is_a?(Hash)
-            data = {}
-            args[:data].each do |key, value|
-              data[key.to_s] = value.to_s
-            end
-
-            @data = data
+            @data = { 'payload' => JSON.dump(args[:data]) }
           end
+          @webpush = args[:webpush] if args.key?(:webpush)
         end
       end
 
@@ -70,6 +77,36 @@ module Google
           @body = args[:body] if args.key?(:body)
         end
       end
+
+      class Webpush
+        include Google::Apis::Core::Hashable
+
+        attr_accessor :headers
+        attr_accessor :notification
+
+        def initialize(**args)
+          update!(**args)
+        end
+
+        def update!(**args)
+          @headers = args[:headers] if args.key?(:headers)
+          @notification = WebNotification.new(icon: args[:icon])
+        end
+      end
+
+      class WebNotification
+        include Google::Apis::Core::Hashable
+
+        attr_accessor :icon
+
+        def initialize(**args)
+          update!(**args)
+        end
+
+        def update!(**args)
+          @icon = args[:icon] if args.key?(:icon)
+        end
+      end
     end
   end
 end

data/lib/google/apis/messages/representations.rb

@@ -16,12 +16,22 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
 
+      class Webpush
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+        include Google::Apis::Core::JsonObjectSupport
+      end
 
+      class WebNotification
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+        include Google::Apis::Core::JsonObjectSupport
+      end
 
       class Message
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :message_object, as: 'message', class: Google::Apis::Messages::MessageObject, decorator: Google::Apis::Messages::MessageObject::Representation
+          property :message_object, as: 'message',
+            class: Google::Apis::Messages::MessageObject,
+            decorator: Google::Apis::Messages::MessageObject::Representation
         end
       end
 
@@ -29,8 +39,13 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :topic, as: 'topic'
-          property :notification, as: 'notification', class: Google::Apis::Messages::Notification, decorator: Google::Apis::Messages::Notification::Representation
           property :data, as: 'data'
+          property :notification, as: 'notification',
+            class: Google::Apis::Messages::Notification,
+            decorator: Google::Apis::Messages::Notification::Representation
+          property :webpush, as: 'webpush',
+            class: Google::Apis::Messages::Webpush,
+            decorator: Google::Apis::Messages::Webpush::Representation
         end
       end
 
@@ -40,6 +55,21 @@ module Google
           property :body, as: 'body'
         end
       end
+
+      class Webpush
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :headers, as: 'headers'
+          property :notification, as: 'notification',
+            class: Google::Apis::Messages::WebNotification,
+            decorator: Google::Apis::Messages::WebNotification::Representation
+        end
+      end
+
+      class WebNotification
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :icon, as: 'icon'
+        end
+      end
     end
   end
 end

data/lib/google/apis/messages/service.rb

@@ -27,8 +27,6 @@ module Google
           command = make_simple_command(:post, 'messages:send', options)
           command.request_representation = Google::Apis::Messages::Message::Representation
           command.request_object = message
-          command.response_representation = Google::Apis::Messages::Message::Representation
-          command.response_class = Google::Apis::Messages::Message
 
           execute_or_queue_command(command, &block)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-api-fcm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ilya Krigouzov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -45,7 +45,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Client for accessing Firebase Cloud Messaging APIs