crusade-apns 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3f95ddb07469fa790dd4692470ec4119cfc944d
-  data.tar.gz: 02daf2f36ebcf502067db47495465b3faf8d975a
+  metadata.gz: f3f43365dbbb7d83fda84a7b56659c3fb3842c4b
+  data.tar.gz: 9fc653b9f4a6eddb2beee30e90c57ca3f15b1fb3
 SHA512:
-  metadata.gz: 00225b43140c6039f924d8dba31adfddace4a1e34e0f8b5ba11755d33322d7d590c319be17afd5f023bb074853bb65063920ff70a5ebe1a5b0161e78c5e4ec05
-  data.tar.gz: ef540d4d464d8c3e52020228cc8b8c5470db85388a6f6c29780d1b685578683ba370d3885405b1cd9a21aa063845647a4b1d297703503376ba522fe157008ebb
+  metadata.gz: d0d8f657de2b178403731bd77b27a57daef52b66c66b90d209fed973141d5ed0956855984200aab810a488ce1db497e0f88684f6ca8e33a47f5ae96683d4b03c
+  data.tar.gz: c6977b46d2636894e3cf1291fa3d74a3194f9a672455c5b4f0beed6f3f7b30abbea68d373fd9a7fcf225cca95405863b7732ce90f0d46a38e10affa8c0f9c708

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in crusade-apns.gemspec
-gemspec
+gemspec

data/lib/crusade/apns/notification.rb

@@ -1,14 +1,18 @@
+require 'delegate'
+
 module Crusade
   module APNS
-    class Notification
-      attr_accessor :title, :body, :action, :url_args, :device_token
-
-      def initialize(attrs = {} )
-        self.title        =  attrs.fetch(:title)       { nil }
-        self.body         = attrs.fetch(:body)         { nil }
-        self.action       = attrs.fetch(:action)       { nil }
-        self.url_args     = attrs.fetch(:url_args)     { []  }
-        self.device_token = attrs.fetch(:device_token) { nil }
+    class Notification < SimpleDelegator
+      attr_reader :device_token
+
+      def initialize(notification, device_token = nil)
+        if notification.is_a? Hash
+          device_token = notification[:device_token]
+          notification = Crusade::Notification.new notification
+        end
+        super notification
+        self.notification = notification
+        self.device_token = device_token
       end
 
       def to_json
@@ -21,6 +25,9 @@ module Crusade
 
       private
 
+      attr_accessor :notification
+      attr_writer   :device_token
+
       def payload
         {
           "aps" => aps

data/lib/crusade/apns/push_notification.rb

@@ -15,6 +15,8 @@ module Crusade
       end
 
       def send notification
+        return :invalid unless Array(notification.url_args).count == url_args_in_configuration
+        
         info "sending notification #{notification.inspect}"
         connection.send encoder.encode notification
       end
@@ -27,6 +29,10 @@ module Crusade
       def connection
         @connection ||= Crusade::APNS::SocketConnection.new(configuration)
       end
+
+      def url_args_in_configuration
+        configuration.url_format.scan("%@").count
+      end
     end
   end
 end

data/lib/crusade/apns/version.rb

@@ -1,5 +1,5 @@
 module Crusade
   module APNS
-    VERSION = "0.8.0"
+    VERSION = "0.8.2"
   end
 end

data/test/integration/push_notification_test.rb

@@ -29,15 +29,11 @@ eof
     end
 
     it 'sends the binary representation of the notification' do
-      subject.send Fixtures.default_notification
+      subject.send Fixtures.default_apns_notification
 
       Timeout::timeout(1, ThreadError) { while(server.received.size == 0) ; end }
 
       server.received.last.must_equal Base64.decode64 binary
     end
   end
-
-  describe 'configuration' do
-    it { subject.configuration.must_be_same_as options }
-  end
 end

data/test/support/fixtures.rb

@@ -1,13 +1,15 @@
 require 'tmpdir'
 
 require 'crusade/apns/push_notification'
+require 'crusade/notification'
+require 'crusade/apns/notification'
 
 class Fixtures
   def self.default_configuration
     OpenStruct.new({
       site_name: 'Bay Airlines',
       push_id: 'web.com.example.domain',
-      url_format: 'http://domain.example.com/%@/?flight=%@',
+      url_format: 'http://domain.example.com/?flight=%@',
       webservice_url: 'https://example.com/push',
       allowed_domains: ['http://example.com'],
       temp_dir: Dir.mktmpdir,
@@ -19,7 +21,7 @@ class Fixtures
   end
 
   def self.default_notification
-    Crusade::APNS::Notification.new({
+    Crusade::Notification.new({
       title: 'the title',
       body: 'the body',
       action: 'submit',
@@ -27,4 +29,8 @@ class Fixtures
       device_token: '1234a'
     })
   end
+
+  def self.default_apns_notification
+    Crusade::APNS::Notification.new default_notification, '1234a'
+  end
 end

data/test/unit/notification_encoder_test.rb

@@ -13,7 +13,7 @@ describe Crusade::APNS::NotificationEncoder do
   subject { Crusade::APNS::NotificationEncoder.new options }
 
   describe 'encode' do
-    let(:notification) { Fixtures.default_notification }
+    let(:notification) { Fixtures.default_apns_notification }
     let(:expected) do
 <<-eof
 AQAAAAAAAVGAACASNKAAXHsiYXBzIjp7ImFsZXJ0Ijp7InRpdGxlIjoidGhl

data/test/unit/notification_test.rb

@@ -1,9 +1,12 @@
 require File.expand_path '../../test_helper.rb', __FILE__
 
+require 'crusade/notification'
 require 'crusade/apns/notification'
 
 describe Crusade::APNS::Notification do
   let(:described_class) { Crusade::APNS::Notification }
+  let(:notification)    { Crusade::Notification.new attrs }
+  let(:device_token)    { '1234a' }
 
   let(:attrs) do
     {
@@ -11,78 +14,71 @@ describe Crusade::APNS::Notification do
       body: 'the body',
       action: 'submit',
       url_args: ['a'],
-      device_token: '1234a'
+      device_token: device_token
     }
   end
 
   describe 'initialize' do
-    subject { described_class.new }
+    describe 'with a generic notification' do
+      subject { described_class.new notification, device_token }
 
-    it 'initializes the title' do
-      subject.title.must_be_nil
-    end
-
-    it 'initializes the body' do
-      subject.body.must_be_nil
-    end
+      it 'delegates the generic properties' do
+        subject.title.must_equal 'the title'
+      end
 
-    it 'initializes the action' do
-      subject.action.must_be_nil
+      it 'has a device token' do
+        subject.device_token.must_equal device_token
+      end
     end
 
-    it 'initializes the url_args' do
-      subject.url_args.must_equal []
-    end
+    describe 'with a hash of attributes' do
+      subject { described_class.new attrs }
 
-    it 'initializes the device_token' do
-      subject.device_token.must_be_nil
-    end
+      it 'internally builds a generic notification' do
+        subject.title.must_equal 'the title'
+      end
 
-    describe 'with a hash' do
-      subject { described_class.new attrs }
+      it 'has a device token' do
+        subject.device_token.must_equal device_token
+      end
 
-      it { subject.title.must_equal 'the title' }
-      it { subject.body.must_equal 'the body' }
-      it { subject.action.must_equal 'submit' }
-      it { subject.url_args.must_equal ['a'] }
-      it { subject.device_token.must_equal '1234a' }
     end
+  end
 
-    describe 'payload and co' do
-      subject { described_class.new attrs }
-
-      let(:parsed_payload) { JSON.parse(subject.to_json) }
-      let(:expected_payload) do
-        {
-          "aps" => {
-            "alert" => {
-              "title" => 'the title',
-              "body" => 'the body',
-              "action" => 'submit'
-            },
-            "url-args" => ['a']
-          }
+  describe 'payload and co' do
+    subject { described_class.new notification }
+
+    let(:parsed_payload) { JSON.parse(subject.to_json) }
+    let(:expected_payload) do
+      {
+        "aps" => {
+          "alert" => {
+            "title" => 'the title',
+            "body" => 'the body',
+            "action" => 'submit'
+          },
+          "url-args" => ['a']
         }
-      end
-
-      it { parsed_payload.must_equal expected_payload }
-      it { subject.json_size.must_equal 92 }
+      }
+    end
 
-      describe 'no url_args' do
-        before do
-          subject.url_args = []
-        end
+    it { parsed_payload.must_equal expected_payload }
+    it { subject.json_size.must_equal 92 }
 
-        it { parsed_payload['aps'].has_key?('url-args').must_be_false }
+    describe 'no url_args' do
+      before do
+        notification.url_args = []
       end
 
-      describe 'no action' do
-        before do
-          subject.action = nil
-        end
+      it { parsed_payload['aps'].has_key?('url-args').must_be_false }
+    end
 
-        it { parsed_payload['aps']['alert'].has_key?('action').must_be_false }
+    describe 'no action' do
+      before do
+        notification.action = nil
       end
+
+      it { parsed_payload['aps']['alert'].has_key?('action').must_be_false }
     end
   end
 end

data/test/unit/push_notification_test.rb

@@ -0,0 +1,46 @@
+require File.expand_path '../../test_helper.rb', __FILE__
+
+require 'ostruct'
+
+class FakeEncoder
+  def encode notification
+    '123'
+  end
+end
+
+describe Crusade::APNS::PushNotification do
+  let(:options) { Fixtures.default_configuration }
+  subject { Crusade::APNS::PushNotification.new options, connection }
+  let(:connection) { MiniTest::Mock.new }
+  let(:notification) { OpenStruct.new(url_args: %w(1)) }
+
+  describe 'send' do
+    let(:encoder) { FakeEncoder.new }
+
+    before do
+      
+    end
+
+    it 'sends the encoded notification' do
+      Crusade::APNS::NotificationEncoder.stub(:new, encoder) do
+        connection.expect :send,  true, ['123']
+
+        subject.send notification
+
+        connection.verify.must_be_true
+      end
+    end
+
+    it 'returns :invalid if the number of url args is not the same as in the configuration' do
+      notification.url_args = %w(1 2 3)
+
+      result = subject.send notification
+
+      result.must_equal :invalid
+    end
+  end
+
+  describe 'configuration' do
+    it { subject.configuration.must_be_same_as options }
+  end
+end

data/test/unit/push_package/website_file_generator_test.rb

@@ -30,7 +30,7 @@ describe Crusade::APNS::WebsiteFileGenerator do
         "websiteName"         => "Bay Airlines",
         "websitePushID"       => "web.com.example.domain",
         "allowedDomains"      => ['http://example.com'],
-        "urlFormatString"     => "http://domain.example.com/%@/?flight=%@",
+        "urlFormatString"     => "http://domain.example.com/?flight=%@",
         "authenticationToken" => "token",
         "webServiceURL"       => "https://example.com/push"
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crusade-apns
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - David Rouchy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crusade
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +141,6 @@ files:
 - lib/crusade/apns/configuration.rb
 - lib/crusade/apns/crypto/user_token_generator.rb
 - lib/crusade/apns/notification.rb
-- lib/crusade/apns/notification_builder.rb
 - lib/crusade/apns/notification_encoder.rb
 - lib/crusade/apns/push_notification.rb
 - lib/crusade/apns/push_package/directory_structure_generator.rb
@@ -179,9 +178,9 @@ files:
 - test/support/zip_support.rb
 - test/test_helper.rb
 - test/unit/configuration_test.rb
-- test/unit/notification_builder_test.rb
 - test/unit/notification_encoder_test.rb
 - test/unit/notification_test.rb
+- test/unit/push_notification_test.rb
 - test/unit/push_package/directory_structure_generator_test.rb
 - test/unit/push_package/manifest_generator_test.rb
 - test/unit/push_package/signature_generator_test.rb
@@ -238,9 +237,9 @@ test_files:
 - test/support/zip_support.rb
 - test/test_helper.rb
 - test/unit/configuration_test.rb
-- test/unit/notification_builder_test.rb
 - test/unit/notification_encoder_test.rb
 - test/unit/notification_test.rb
+- test/unit/push_notification_test.rb
 - test/unit/push_package/directory_structure_generator_test.rb
 - test/unit/push_package/manifest_generator_test.rb
 - test/unit/push_package/signature_generator_test.rb

data/lib/crusade/apns/notification_builder.rb

@@ -1,46 +0,0 @@
-require 'crusade/apns/notification'
-
-module Crusade
-  module APNS
-    class NotificationBuilder
-
-      def initialize
-        self.notification = Crusade::APNS::Notification.new
-      end
-
-      def build
-        notification
-      end
-
-      def with_title(title)
-        notification.title = title
-        self
-      end
-
-      def with_body(body)
-        notification.body = body
-        self
-      end
-
-      def with_action(action)
-        notification.action = action
-        self
-      end
-
-      def with_url_args(url_args)
-        notification.url_args = url_args
-        self
-      end
-
-      def with_device_token(device_token)
-        notification.device_token = device_token
-        self
-      end
-
-      private
-
-      attr_accessor :notification
-
-    end
-  end
-end

data/test/unit/notification_builder_test.rb

@@ -1,76 +0,0 @@
-require File.expand_path '../../test_helper.rb', __FILE__
-
-require 'crusade/apns/notification_builder'
-
-describe Crusade::APNS::NotificationBuilder do
-  let(:described_class) { Crusade::APNS::NotificationBuilder }
-  subject { described_class.new }
-
-  describe 'build' do
-    it' creates a notification' do
-      notification = subject.build
-
-      notification.is_a?(Crusade::APNS::Notification).must_be_true
-    end
-  end
-
-  describe 'with_title' do
-    it 'returns the builder' do
-      subject.with_title('test').must_be_same_as subject
-    end
-
-    it 'sets the title of the notification' do
-      notif = subject.with_title('test').build
-
-      notif.title.must_equal 'test'
-    end
-  end
-
-  describe 'with_body' do
-    it 'returns the builder' do
-      subject.with_body('test').must_be_same_as subject
-    end
-
-    it 'sets the body of the notification' do
-      notif = subject.with_body('test').build
-
-      notif.body.must_equal 'test'
-    end
-  end
-
-  describe 'with_action' do
-    it 'returns the builder' do
-      subject.with_action('test').must_be_same_as subject
-    end
-
-    it 'sets the action of the notification' do
-      notif = subject.with_action('test').build
-
-      notif.action.must_equal 'test'
-    end
-  end
-
-  describe 'with_url_args' do
-    it 'returns the builder' do
-      subject.with_url_args('test').must_be_same_as subject
-    end
-
-    it 'sets the url_args of the notification' do
-      notif = subject.with_url_args(['test']).build
-
-      notif.url_args.must_equal ['test']
-    end
-  end
-
-  describe 'with_device_token' do
-    it 'returns the builder' do
-      subject.with_device_token('test').must_be_same_as subject
-    end
-
-    it 'sets the url_args of the notification' do
-      notif = subject.with_device_token('test').build
-
-      notif.device_token.must_equal 'test'
-    end
-  end
-end