pntfr 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5cf720813ce033ef80813fd133fc74ef8db6b2b
-  data.tar.gz: 38e3393d5950af33c10bd82e01e5eec01cc01345
+  metadata.gz: bc9ce43d0b5be354b83dc3016f76ea72f40f1866
+  data.tar.gz: 5f3a937bcb675fd5d6a94ab6c3b88d814c6ce639
 SHA512:
-  metadata.gz: c73fce1055940fec086f8a242deae2ab71ec09d950e269c1bfbc6ae6203b14d36dc5a8476b803d6660ca8f11053f1b914f01d305d17537dccd95b803e9c596f7
-  data.tar.gz: 43d6a4e89c141f6025418a24351bfd967b09f54656b1981cefde5f1c4e3be4545d4e11e2b230194f8ba139a8fbf79201e52a7da98e3869a479adad51bde20958
+  metadata.gz: b5f2f8fdffc88fbf0dd442a552e83c9c67fe8b13875f8d572e7edc7c4d003680c68f6024cb2cd46ebdbd49442de709af02f0a06641fc1758fc0b644913bf00d1
+  data.tar.gz: d32daa6100a28971816169e966bb80acc8be28176c55536fd096fb861a2133dfdc29ec02bd233dbaab051af7e60c0e9ccf7285bcd6a8191f05f9dabcb1d1d464

data/README.md

@@ -5,7 +5,7 @@ Push Notifier is a simple adapter for APNS (Apple Push Notification Service) and
 ## Installation
 Add it to your Gemfile:
 
-gem 'pntfr', '~>0.3.0'
+gem 'pntfr', '0.4.1'
 
 ## Configuration
 Pntfr can be configured in two ways.
@@ -103,16 +103,16 @@ notifier.msg(
 notifier.notify
 
 
-# Supose you have this configuration for 
 # SETTING ANPS AND GCN CREDENTIALS ON EACH NOTIFICATION
 # using different configuration on each call
-credentials= {ios: {
-        host: 'test-host',
+credentials= {
+  # for ios you select what you override, in this case host and port will be
+  # kept from the general configuration
+  ios: {
         pem: 'test-pem',
-        port: 'test-port',
         pass: 'test-password',
       },
-andr: 'notification key'
+  andr: 'notification key'
 }
 notifier= Pntfr::Notifier.new( credentials )
 # this Notifier instance overrides the global credentials configuration (if any)

data/lib/pntfr/session/ios.rb

@@ -9,11 +9,7 @@ module Pntfr
       attr_reader :apns
 
       def initialize apns_config=nil
-        if apns_config.nil?
-          configure_apns(Pntfr.config.apns)
-        else
-          configure_apns(apns_config)
-        end
+        configure_apns(apns_config)
       end
 
       def notify devices, notification
@@ -46,7 +42,11 @@ module Pntfr
         device.methods.include?(:num_notifs)
       end
 
-      def configure_apns config
+      def configure_apns config_override
+        config= Pntfr.config.apns
+        unless config_override.nil?
+          config= config.clone.merge(config_override)
+        end
         APNS.host = config[:host]
         APNS.pem  = config[:pem]
         APNS.port = config[:port]

data/lib/pntfr/version.rb

@@ -1,12 +1,16 @@
 module Pntfr
   #
+  # PATCH v0.4.1
+  # - Republish gem after gem yanking it.
+  #
+  # MINOR v0.4.0
+  # - [FEATURE] When overriding ios credentials, merge over general configuration.
+  #
+  # MINOR v0.3.0
   # - Performance improvement: Allow sending one message to many devices in one
   # single call (on both platforms).
   # - Allow overriding general configuration credentials when instantiating each
   # Notifier (on both platforms).
   # - Internal refactoring.
-  #
-  # As this change don't break the gem's API (it extends it), lets change only
-  # minor version.
-  VERSION = '0.3.0'
+  VERSION = '0.4.1'
 end

data/test/pntfr/ios_test.rb

@@ -1,6 +1,12 @@
 require 'pntfr/device'
 module Pntfr
   class IosTest < Minitest::Test
+    TEST_GENERAL_IOS_CONFIG= {
+      host: 'test-general_host',
+      pem: 'test-general_pem',
+      port: 'test-general_port',
+      pass: 'test-general_password',
+    }
     def setup
       @push_id= 'IOSiosIOSiosIOSiosIOSiosIOSiosIOSiosIOSiosIOSiosIOSiosIOSios'
     end
@@ -61,7 +67,22 @@ module Pntfr
       assert_equal({lastkey: 'last value'}, custom[:'last-extra'])
     end
 
-    def test_when_overriding_ios_credentials_should_use_new_ones
+    def test_when_not_overriding_ios_credentials_should_use_general_config_credentials
+      Pntfr.configure do |config|
+        config.apns= TEST_GENERAL_IOS_CONFIG
+      end
+      ios_session= Pntfr::Session::Ios.new
+      apns= ios_session.apns
+      assert_equal TEST_GENERAL_IOS_CONFIG[:host], apns.host
+      assert_equal TEST_GENERAL_IOS_CONFIG[:pem], apns.pem
+      assert_equal TEST_GENERAL_IOS_CONFIG[:port], apns.port
+      assert_equal TEST_GENERAL_IOS_CONFIG[:pass], apns.pass
+    end
+
+    def test_when_overriding_all_ios_credentials_should_use_new_ones
+      Pntfr.configure do |config|
+        config.apns= TEST_GENERAL_IOS_CONFIG
+      end
       apns_config= {
         host: 'test-host',
         pem: 'test-pem',
@@ -76,6 +97,22 @@ module Pntfr
       assert_equal 'test-password', apns.pass
     end
 
+    def test_when_overriding_some_ios_credentials_should_use_new_ones_but_keep_others
+      Pntfr.configure do |config|
+        config.apns= TEST_GENERAL_IOS_CONFIG
+      end
+      apns_config= {
+        pem: 'some-test-pem',
+        pass: 'some-test-password',
+      }
+      ios_session= Pntfr::Session::Ios.new(apns_config)
+      apns= ios_session.apns
+      assert_equal TEST_GENERAL_IOS_CONFIG[:host], apns.host
+      assert_equal 'some-test-pem', apns.pem
+      assert_equal TEST_GENERAL_IOS_CONFIG[:port], apns.port
+      assert_equal 'some-test-password', apns.pass
+    end
+
     #-----------------------------------------------------------
     private
     #-----------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pntfr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apns