bmo 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23d63ae64ab9ac9fab8229c7cf0b43b111e413bf
-  data.tar.gz: 1cd480f8496f07d8914fe6d4e17736d61e27fd07
+  metadata.gz: 19acde83274fe69f0e14d40f818a4eb7bb87d412
+  data.tar.gz: ce53e972d6982339045099bbafc779dfe128b9de
 SHA512:
-  metadata.gz: aae11c2f1ec38e1976fdc735b474f0c06e1b086af37ed50672505b5f629e0b106884eb6a6de0b16699b36922d9797811118a3160132f03fc97846a44629f6968
-  data.tar.gz: 922eb4198e2cae3aaebbb61089a05ec40d4bb821bdfbcc6ea6f0ed7bc29f7903756fa7279394f23a6b1468f5449604f872a2ea4e742c25b82d5a5097a4bbd97a
+  metadata.gz: 5f9ce0b3ba64b2cca3f6cf28df9f82357089c0085e53417a208b68276dd3c5d1f89f40467311a8499d390f62cf7241ade70a11affab776920097417178bc85f6
+  data.tar.gz: d7023aef52e8f447241a9fdf2edc8749338987cd35da29e394fc837ddcb6cd4d0db94ae08eb9180419f1964a98f79ef4ec9b0596b7343816c816d672716096c1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bmo (0.9.0)
+    bmo (0.10.0)
       equalizer (~> 0.0.0)
       faraday (> 0.8.0)
 

data/lib/bmo.rb

@@ -23,8 +23,8 @@ module BMO
   #
   # @param device_token [String]
   # @param data [Hash] The data you want to send
-  # @option options :truncable_field If the payload is too large
-  #  this field will be truncated, it must be in an aps hash
+  # @option options :truncable_alert If the payload is too large
+  #  this alert field will be truncated
   # @option options :omission ('...') The omission in truncate
   # @option options :separator The separator use in truncation
   #

data/lib/bmo/apns/notification.rb

@@ -36,16 +36,16 @@ module BMO
         # Define ==
         include Equalizer.new(:data)
 
-        attr_reader :data, :truncable_field, :options
+        attr_reader :data, :truncable_alert, :custom_data, :options
 
         def initialize(data, options = {})
           @data            = data
-          @truncable_field = options[:truncable_field]
+          @truncable_alert = options[:truncable_alert]
           @options         = options
         end
 
         def to_package
-          truncate_field! if truncable_field && !valid?
+          truncate_alert! if truncable_alert && !valid?
           validate!
           package
         end
@@ -62,13 +62,14 @@ module BMO
           [2, json.bytes.count, json].pack('cna*')
         end
 
-        def truncate_field!
-          return unless data[:aps] && data[:aps][truncable_field]
-          string                = data[:aps][truncable_field]
+        def truncate_alert!
+          return unless data[:aps] && data[:aps][:alert]
+          string                = data[:aps][:alert]
           diff_bytesize         = package.bytesize - MAX_BYTE_SIZE
           desirable_bytesize    = (string.bytesize - diff_bytesize) - 1
-          data[:aps][truncable_field] = Utils
-            .bytesize_force_truncate(string, desirable_bytesize, options)
+          data[:aps][:alert] = Utils.bytesize_force_truncate(string,
+                                                             desirable_bytesize,
+                                                             options)
         end
 
         def valid?

data/lib/bmo/version.rb

@@ -1,4 +1,4 @@
 # Main BMO module, version get right here
 module BMO
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.11.0'.freeze
 end

data/spec/bmo/apns/notification_spec.rb

@@ -23,7 +23,7 @@ describe BMO::APNS::Notification::DeviceToken do
   describe '#to_package' do
     it 'returns the packaged token' do
       device_token = described_class.new('0' * 64)
-      expect(device_token.to_package).to eq("\x00" * 32)
+      expect(device_token.to_package).to eq("\x01\x00 " + "\x00" * 32)
     end
   end
 end
@@ -31,6 +31,13 @@ end
 describe BMO::APNS::Notification::Payload do
   let(:payload_max_size) { BMO::APNS::Notification::Payload::MAX_BYTE_SIZE }
 
+  describe 'custom_data field' do
+    it 'truncates if there is a truncable field and this is not valid' do
+      payload = described_class.new(aps: { alert: 'a' }, custom_data: { hello: 'world' })
+      expect(payload.to_package).to eq("\x02\x005{\"aps\":{\"alert\":\"a\"},\"custom_data\":{\"hello\":\"world\"}}")
+    end
+  end
+
   describe '#validate!' do
     it 'returns true if the payload is valid' do
       payload = described_class.new(aps: 'a' * 200)
@@ -45,38 +52,39 @@ describe BMO::APNS::Notification::Payload do
 
   describe '#to_package' do
     it 'truncates if there is a truncable field and this is not valid' do
-      options = { truncable_field: :message }
-      payload = described_class.new({ aps: { message: 'a' * payload_max_size } }, options)
-      expect(payload.to_package).to eq("{\"aps\":{\"message\":\"#{'a' * (payload_max_size - 26)}...\"}}")
+      options = { truncable_alert: true }
+      payload = described_class.new({ aps: { alert: 'a' * payload_max_size } }, options)
+      # I'm not able to write the hex literal for the beginning
+      expect(payload.to_package).to end_with("{\"aps\":{\"alert\":\"#{'a' * (payload_max_size - 27)}...\"}}")
     end
 
     it 'truncates to respect the MAX_BYTE_SIZE' do
-      options = { truncable_field: :message }
-      payload = described_class.new({ aps: { message: 'a' * payload_max_size } }, options)
+      options = { truncable_alert: true }
+      payload = described_class.new({ aps: { alert: 'a' * payload_max_size } }, options)
       expect(payload.to_package.bytesize).to be < BMO::APNS::Notification::Payload::MAX_BYTE_SIZE
     end
   end
 
   describe '#truncable_field!' do
     it 'truncates the corresponding field in aps' do
-      options = { truncable_field: :message }
-      payload = described_class.new({ aps: { message: 'a' * payload_max_size } }, options)
-      payload.truncate_field!
-      expect(payload.data[:aps][:message]).to eq(('a' * (payload_max_size - 26)) + '...')
+      options = { truncable_alert: true }
+      payload = described_class.new({ aps: { alert: 'a' * payload_max_size } }, options)
+      payload.truncate_alert!
+      expect(payload.data[:aps][:alert]).to eq(('a' * (payload_max_size - 27)) + '...')
     end
 
     it 'truncates with omission' do
-      options = { truncable_field: :message, omission: '[more]' }
-      payload = described_class.new({ aps: { message: 'a' * payload_max_size } }, options)
-      payload.truncate_field!
-      expect(payload.data[:aps][:message]).to eq(('a' * (payload_max_size - 29)) + '[more]')
+      options = { truncable_field: :true, omission: '[more]' }
+      payload = described_class.new({ aps: { alert: 'a' * payload_max_size } }, options)
+      payload.truncate_alert!
+      expect(payload.data[:aps][:alert]).to eq(('a' * (payload_max_size - 30)) + '[more]')
     end
 
     it 'truncates with separator' do
-      options = { truncable_field: :message, separator: ' ' }
-      payload = described_class.new({ aps: { message: 'test ' + ('a' * (payload_max_size - 1)) } }, options)
-      payload.truncate_field!
-      expect(payload.data[:aps][:message]).to eq('test...')
+      options = { truncable_field: true, separator: ' ' }
+      payload = described_class.new({ aps: { alert: 'test ' + ('a' * (payload_max_size - 1)) } }, options)
+      payload.truncate_alert!
+      expect(payload.data[:aps][:alert]).to eq('test...')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bmo
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Antoine Lyset