notify_user 0.0.28 → 0.0.29

data/spec/models/notify_user/houston_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+module NotifyUser
+  describe Houston do
+
+    let(:user) { User.create({email: 'user@example.com' })}
+    let(:notification) { NewPostNotification.create({target: user}) }
+
+    before :each do
+      allow_any_instance_of(BaseNotification).to receive(:mobile_message).and_return('New Notification')
+      allow_any_instance_of(User).to receive(:devices).and_return(double('device'))
+    end
+
+    describe "initialisation" do
+      it "should initialise the correct push options" do
+        @houston = NotifyUser::Houston.new(notification, {})
+
+        expect(@houston.push_options[:alert]).to eq 'New Notification'
+        expect(@houston.push_options[:badge]).to eq 1
+        expect(@houston.push_options[:category]).to eq 'NewPostNotification'
+        expect(@houston.push_options[:custom_data]).to be_empty
+        expect(@houston.push_options[:sound]).to eq 'default'
+      end
+
+      it "should access the notification targets list of devices" do
+        expect(user).to receive(:devices)
+
+        @houston = NotifyUser::Houston.new(notification, {})
+      end
+    end
+
+  end
+end

data/spec/models/notify_user/notification_spec.rb

@@ -9,7 +9,7 @@ module NotifyUser
 
     before :each do
       BaseNotification.any_instance.stub(:mobile_message).and_return("New Notification")
-      BaseNotification.channel(:apns, {aggregate_per: false})
+      # BaseNotification.channel(:apns, {aggregate_per: false})
     end
 
     describe "notification count" do
@@ -60,136 +60,102 @@ module NotifyUser
 
     describe "#notify" do
 
-      it "raises an exception if the notification is not valid" do
-        notification.target = nil
-        expect { notification.notify }.to raise_error
+      it "sets the state to pending" do
+        notification = NewPostNotification.create({target: user})
+        notification.notify
+        notification.state.should eq "pending"
       end
 
-      describe "with aggregation enabled" do
-        before :each do
-          NewPostNotification.channel(:apns, {aggregate_per: false})
-        end
+      describe "#deliver" do
 
-        it "schedules a job to wait for more notifications to aggregate if there is not one already" do
-          BaseNotification.should_receive(:delay_for)
-                          .with(notification.class.aggregate_per)
-                          .and_call_original
-          ActionMailerChannel.should_receive(:deliver)
-          Apns.should_receive(:push_notification)
-          notification.notify
-        end
+        describe "with aggregation enabled" do
+          it "schedules a job to wait for more notifications to aggregate if there is not one already" do
+            NewPostNotification.should_receive(:delay_for)
+                            .with(notification.class.aggregate_per).and_call_original
 
-        it "if dev urbanairship keys detected send notifications both to production and dev keys" do
-          BaseNotification.should_receive(:delay_for)
-                          .with(notification.class.aggregate_per)
-                          .and_call_original
-          ActionMailerChannel.should_receive(:deliver)
-          Apns.should_receive(:push_notification).twice
+            notification.deliver
+          end
 
-          ENV['DEV_UA_APPLICATION_KEY'] = 'sdfsdf'
-          ENV['DEV_UA_APPLICATION_SECRET'] = 'dsfsdf'
-          ENV['DEV_UA_MASTER_SECRET'] = 'sdfsdf'
+          it "doesn't schedule a job if a pending notification awaiting aggregation already exists" do
+            another_notification = NewPostNotification.create({target: user})
+            NewPostNotification.should_not_receive(:delay_for)
+                            .with(notification.class.aggregate_per).and_call_original
 
-          notification.notify
+            notification.deliver
+          end
         end
 
-        it "does not schedule an aggregation job if there is one already" do
-          Sidekiq::Testing.fake!
-
-          notification.notify
-          
-          another_notification = NewPostNotification.new({target: user})
+        describe "with aggregation disabled" do
+          before :each do
+            NewPostNotification.channel(:action_mailer, {aggregate_per: false})
+          end
 
-          BaseNotification.should_not_receive(:delay_for)
-          another_notification.notify
+          it "schedules notification to be sent through channels" do
+            NewPostNotification.should_receive(:delay).and_call_original
+            notification.deliver        
+          end
         end
+      end
+    end
 
-        describe ".notify_aggregated" do
+    describe "notify!" do
 
-          it "sends an aggregated email if more than one notification queued up" do
-            Sidekiq::Testing.inline!
-            
-            NewPostNotification.create({target: user})
+      it "sets the state to pending_no_aggregation" do
+        notification = NewPostNotification.create({target: user})
+        notification.notify!
+        notification.state.should eq "pending_no_aggregation"
+      end
 
-            NotificationMailer.should_receive(:aggregate_notifications_email).with(NewPostNotification.pending_aggregation_with(notification), anything).and_call_original
-            NewPostNotification.notify_aggregated(notification.id)
-          end
+      describe ".deliver_notification_channel" do 
 
-          it "sends a singular email if no more notifications were queued since the original was delayed" do
-            Sidekiq::Testing.inline!
-            Apns.should_receive(:push_notification).at_least(1).times
-            NotificationMailer.should_receive(:notification_email).with(notification, anything).and_call_original
-            NewPostNotification.notify_aggregated(notification.id)
+          before :each do
+            @notification = NewPostNotification.create({target: user})
           end
 
-        end
-
-        describe ".delovery_notification_channel" do 
-
           it "doesn't send if unsubscribed from channel" do
-            unsubscribe = NotifyUser::Unsubscribe.create({target: user, type: "NewPostNotification"}) 
+            unsubscribe = NotifyUser::Unsubscribe.create({target: user, type: "action_mailer"}) 
             ActionMailerChannel.should_not_receive(:deliver)
-            BaseNotification.deliver_notification_channel(notification.id, "action_mailer")
+            BaseNotification.deliver_notification_channel(@notification.id, "action_mailer")
           end
 
           it "does send if subscribed to channel" do
             ActionMailerChannel.should_receive(:deliver)
-            BaseNotification.deliver_notification_channel(notification.id, "action_mailer")
+            BaseNotification.deliver_notification_channel(@notification.id, "action_mailer")
           end
+      end
 
+      describe "#deliver!" do
+        it "schedules to be delivered to channels" do
+          notification.dont_aggregate
+          NewPostNotification.should_receive(:deliver_channels)
+                              .with(notification.id)
+                              .and_call_original
+          notification.deliver!            
         end
+      end
 
-        describe " .notify_aggregated_channel" do
-
-          it "sends an aggregated email if more than one notification queued up" do
-            Sidekiq::Testing.inline!
-            
-            NewPostNotification.create({target: user, type: 'NewPostNotification'})
-
-            NewPostNotification.should_receive(:deliver_notifications_channel).and_call_original
-            NewPostNotification.notify_aggregated_channel(notification.id, 'action_mailer')
-          end
-
-          it "sends a single email if more not pending notifications" do
-            Sidekiq::Testing.inline!
-
-            NewPostNotification.should_receive(:deliver_notification_channel).and_call_original
-            NewPostNotification.notify_aggregated_channel(notification.id, 'action_mailer')
-          end
+      describe "#deliver_channels" do
+        
+        it "delivers notification to channels" do
+          ActionMailerChannel.should_receive(:deliver).once
+          NewPostNotification.deliver_channels(notification.id)
         end
 
       end
-
     end
 
-    describe "#notify!" do
-      before :each do 
-        NewPostNotification.channel(:apns, {aggregate_per: false})
-      end
-
-      it "sends immediately, ignoring aggregation" do
-        Apns.should_receive(:push_notification).at_least(1).times
-        BaseNotification.should_not_receive(:delay_for)
-        ActionMailerChannel.should_receive(:deliver)
-        notification.notify!
-      end
-
-      it "doesn't send if unsubscribed from type" do
-        unsubscribe = NotifyUser::Unsubscribe.create({target: user, type: "NewPostNotification"}) 
-        ActionMailerChannel.should_not_receive(:deliver)
-        ApnsChannel.should_not_receive(:deliver)
-
-        notification.notify!
+    describe "#notify_aggregated_channel"  do
 
+      it "if only one notification to aggregate hit deliver_notification_channel" do
+        NewPostNotification.should_receive(:deliver_notification_channel).with(notification.id, :action_mailer).once
+        NewPostNotification.notify_aggregated_channel(notification.id, :action_mailer)
       end
 
-      it "doesn't send if unsubscribed from mailer channel" do
-        unsubscribe = NotifyUser::Unsubscribe.create({target: user, type: "action_mailer"}) 
-        unsubscribe.save!
-        ActionMailerChannel.should_not_receive(:deliver)
+      it "if many notifications to aggregate hit deliver_notifications_channel" do
+        another_notification = NewPostNotification.create({target: user})
 
-        ApnsChannel.should_receive(:deliver)
-        notification.notify!
+        NewPostNotification.should_receive(:deliver_notifications_channel).once
+        NewPostNotification.notify_aggregated_channel(notification.id, :action_mailer)
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notify_user
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Tom Spacek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: houston
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test_after_commit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Drop-in solution for user notifications. Handles notifying by email,
   SMS and APNS, plus per-user notification frequency settings and views for checking
   new notifications.
@@ -211,10 +253,13 @@ files:
 - app/controllers/notify_user/notifications_controller.rb
 - app/helpers/notify_user/application_helper.rb
 - app/mailers/notify_user/notification_mailer.rb
+- app/models/notify_user/apn_connection.rb
 - app/models/notify_user/apns.rb
 - app/models/notify_user/base_notification.rb
+- app/models/notify_user/houston.rb
 - app/models/notify_user/pub_nub.rb
 - app/models/notify_user/unsubscribe.rb
+- app/models/notify_user/urban_airship.rb
 - app/models/notify_user/user_hash.rb
 - app/serializers/notify_user/notification_serializer.rb
 - app/views/layouts/notify_user/application.html.erb
@@ -249,6 +294,57 @@ files:
 - lib/notify_user/version.rb
 - lib/tasks/notify_user.rake
 - spec/controllers/notify_user/notifications_controller_spec.rb
+- spec/dummy/rails-3.2.17/Gemfile
+- spec/dummy/rails-3.2.17/README.rdoc
+- spec/dummy/rails-3.2.17/Rakefile
+- spec/dummy/rails-3.2.17/app/assets/images/rails.png
+- spec/dummy/rails-3.2.17/app/assets/javascripts/application.js
+- spec/dummy/rails-3.2.17/app/assets/stylesheets/application.css
+- spec/dummy/rails-3.2.17/app/controllers/application_controller.rb
+- spec/dummy/rails-3.2.17/app/controllers/notify_user/notifications_controller.rb
+- spec/dummy/rails-3.2.17/app/helpers/application_helper.rb
+- spec/dummy/rails-3.2.17/app/models/user.rb
+- spec/dummy/rails-3.2.17/app/notifications/new_post_notification.rb
+- spec/dummy/rails-3.2.17/app/views/layouts/application.html.erb
+- spec/dummy/rails-3.2.17/app/views/notify_user/layouts/action_mailer.html.erb
+- spec/dummy/rails-3.2.17/app/views/notify_user/new_post_notification/action_mailer/notification.html.erb
+- spec/dummy/rails-3.2.17/app/views/notify_user/new_post_notification/mobile_sdk/notification.html.erb
+- spec/dummy/rails-3.2.17/config.ru
+- spec/dummy/rails-3.2.17/config/application.rb
+- spec/dummy/rails-3.2.17/config/boot.rb
+- spec/dummy/rails-3.2.17/config/database.yml
+- spec/dummy/rails-3.2.17/config/environment.rb
+- spec/dummy/rails-3.2.17/config/environments/development.rb
+- spec/dummy/rails-3.2.17/config/environments/production.rb
+- spec/dummy/rails-3.2.17/config/environments/test.rb
+- spec/dummy/rails-3.2.17/config/initializers/backtrace_silencers.rb
+- spec/dummy/rails-3.2.17/config/initializers/inflections.rb
+- spec/dummy/rails-3.2.17/config/initializers/mime_types.rb
+- spec/dummy/rails-3.2.17/config/initializers/notify_user.rb
+- spec/dummy/rails-3.2.17/config/initializers/secret_token.rb
+- spec/dummy/rails-3.2.17/config/initializers/session_store.rb
+- spec/dummy/rails-3.2.17/config/initializers/wrap_parameters.rb
+- spec/dummy/rails-3.2.17/config/locales/en.yml
+- spec/dummy/rails-3.2.17/config/routes.rb
+- spec/dummy/rails-3.2.17/db/migrate/20150106040852_create_users.rb
+- spec/dummy/rails-3.2.17/db/migrate/20150106040854857857604000_create_notify_user_notifications.rb
+- spec/dummy/rails-3.2.17/db/migrate/20150106040854860860323000_create_notify_user_unsubscribes.rb
+- spec/dummy/rails-3.2.17/db/migrate/20150106040854862862248000_create_notify_user_user_hashes.rb
+- spec/dummy/rails-3.2.17/db/schema.rb
+- spec/dummy/rails-3.2.17/db/seeds.rb
+- spec/dummy/rails-3.2.17/doc/README_FOR_APP
+- spec/dummy/rails-3.2.17/log/test.log
+- spec/dummy/rails-3.2.17/public/404.html
+- spec/dummy/rails-3.2.17/public/422.html
+- spec/dummy/rails-3.2.17/public/500.html
+- spec/dummy/rails-3.2.17/public/favicon.ico
+- spec/dummy/rails-3.2.17/public/index.html
+- spec/dummy/rails-3.2.17/public/robots.txt
+- spec/dummy/rails-3.2.17/script/rails
+- spec/dummy/rails-3.2.17/test/fixtures/users.yml
+- spec/dummy/rails-3.2.17/test/performance/browsing_test.rb
+- spec/dummy/rails-3.2.17/test/test_helper.rb
+- spec/dummy/rails-3.2.17/test/unit/user_test.rb
 - spec/dummy/rails-4.0.4/Gemfile
 - spec/dummy/rails-4.0.4/README.rdoc
 - spec/dummy/rails-4.0.4/Rakefile
@@ -326,6 +422,7 @@ files:
 - spec/factories/notify_user_notifications.rb
 - spec/fixtures/notify_user/notification_mailer/notification_email
 - spec/mailers/notify_user/notification_mailer_spec.rb
+- spec/models/notify_user/houston_spec.rb
 - spec/models/notify_user/notification_spec.rb
 - spec/models/notify_user/unsubscribe_spec.rb
 - spec/models/notify_user/user_hash_spec.rb
@@ -359,6 +456,57 @@ specification_version: 4
 summary: A Rails engine for user notifications.
 test_files:
 - spec/controllers/notify_user/notifications_controller_spec.rb
+- spec/dummy/rails-3.2.17/app/assets/images/rails.png
+- spec/dummy/rails-3.2.17/app/assets/javascripts/application.js
+- spec/dummy/rails-3.2.17/app/assets/stylesheets/application.css
+- spec/dummy/rails-3.2.17/app/controllers/application_controller.rb
+- spec/dummy/rails-3.2.17/app/controllers/notify_user/notifications_controller.rb
+- spec/dummy/rails-3.2.17/app/helpers/application_helper.rb
+- spec/dummy/rails-3.2.17/app/models/user.rb
+- spec/dummy/rails-3.2.17/app/notifications/new_post_notification.rb
+- spec/dummy/rails-3.2.17/app/views/layouts/application.html.erb
+- spec/dummy/rails-3.2.17/app/views/notify_user/layouts/action_mailer.html.erb
+- spec/dummy/rails-3.2.17/app/views/notify_user/new_post_notification/action_mailer/notification.html.erb
+- spec/dummy/rails-3.2.17/app/views/notify_user/new_post_notification/mobile_sdk/notification.html.erb
+- spec/dummy/rails-3.2.17/config/application.rb
+- spec/dummy/rails-3.2.17/config/boot.rb
+- spec/dummy/rails-3.2.17/config/database.yml
+- spec/dummy/rails-3.2.17/config/environment.rb
+- spec/dummy/rails-3.2.17/config/environments/development.rb
+- spec/dummy/rails-3.2.17/config/environments/production.rb
+- spec/dummy/rails-3.2.17/config/environments/test.rb
+- spec/dummy/rails-3.2.17/config/initializers/backtrace_silencers.rb
+- spec/dummy/rails-3.2.17/config/initializers/inflections.rb
+- spec/dummy/rails-3.2.17/config/initializers/mime_types.rb
+- spec/dummy/rails-3.2.17/config/initializers/notify_user.rb
+- spec/dummy/rails-3.2.17/config/initializers/secret_token.rb
+- spec/dummy/rails-3.2.17/config/initializers/session_store.rb
+- spec/dummy/rails-3.2.17/config/initializers/wrap_parameters.rb
+- spec/dummy/rails-3.2.17/config/locales/en.yml
+- spec/dummy/rails-3.2.17/config/routes.rb
+- spec/dummy/rails-3.2.17/config.ru
+- spec/dummy/rails-3.2.17/db/migrate/20150106040852_create_users.rb
+- spec/dummy/rails-3.2.17/db/migrate/20150106040854857857604000_create_notify_user_notifications.rb
+- spec/dummy/rails-3.2.17/db/migrate/20150106040854860860323000_create_notify_user_unsubscribes.rb
+- spec/dummy/rails-3.2.17/db/migrate/20150106040854862862248000_create_notify_user_user_hashes.rb
+- spec/dummy/rails-3.2.17/db/schema.rb
+- spec/dummy/rails-3.2.17/db/seeds.rb
+- spec/dummy/rails-3.2.17/doc/README_FOR_APP
+- spec/dummy/rails-3.2.17/Gemfile
+- spec/dummy/rails-3.2.17/log/test.log
+- spec/dummy/rails-3.2.17/public/404.html
+- spec/dummy/rails-3.2.17/public/422.html
+- spec/dummy/rails-3.2.17/public/500.html
+- spec/dummy/rails-3.2.17/public/favicon.ico
+- spec/dummy/rails-3.2.17/public/index.html
+- spec/dummy/rails-3.2.17/public/robots.txt
+- spec/dummy/rails-3.2.17/Rakefile
+- spec/dummy/rails-3.2.17/README.rdoc
+- spec/dummy/rails-3.2.17/script/rails
+- spec/dummy/rails-3.2.17/test/fixtures/users.yml
+- spec/dummy/rails-3.2.17/test/performance/browsing_test.rb
+- spec/dummy/rails-3.2.17/test/test_helper.rb
+- spec/dummy/rails-3.2.17/test/unit/user_test.rb
 - spec/dummy/rails-4.0.4/app/assets/javascripts/application.js
 - spec/dummy/rails-4.0.4/app/assets/stylesheets/application.css
 - spec/dummy/rails-4.0.4/app/controllers/application_controller.rb
@@ -436,6 +584,7 @@ test_files:
 - spec/factories/notify_user_notifications.rb
 - spec/fixtures/notify_user/notification_mailer/notification_email
 - spec/mailers/notify_user/notification_mailer_spec.rb
+- spec/models/notify_user/houston_spec.rb
 - spec/models/notify_user/notification_spec.rb
 - spec/models/notify_user/unsubscribe_spec.rb
 - spec/models/notify_user/user_hash_spec.rb