notifiable-rails 0.16.0 → 0.17.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-rails
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,7 +184,6 @@ files:
 - lib/generators/notifiable/install/templates/initializer.rb
 - lib/notifiable/active_record.rb
 - lib/notifiable/app.rb
-- lib/notifiable/batch.rb
 - lib/notifiable/device_token.rb
 - lib/notifiable/engine.rb
 - lib/notifiable/notifiable_concern.rb
@@ -197,13 +196,12 @@ files:
 - lib/tasks/brakeman.rake
 - LICENSE
 - Rakefile
-- spec/batch_spec.rb
 - spec/controllers/device_tokens_controller_spec.rb
 - spec/controllers/notifications_controller_spec.rb
 - spec/notifiable_app_spec.rb
-- spec/notifiable_server_spec.rb
 - spec/notifiable_spec.rb
 - spec/notification_spec.rb
+- spec/notifier_base_spec.rb
 - spec/spec_helper.rb
 - spec/support/engine_controller.rb
 - spec/support/factories.rb
@@ -277,13 +275,12 @@ signing_key:
 specification_version: 4
 summary: Rails engine to make push notifications a bit easier.
 test_files:
-- spec/batch_spec.rb
 - spec/controllers/device_tokens_controller_spec.rb
 - spec/controllers/notifications_controller_spec.rb
 - spec/notifiable_app_spec.rb
-- spec/notifiable_server_spec.rb
 - spec/notifiable_spec.rb
 - spec/notification_spec.rb
+- spec/notifier_base_spec.rb
 - spec/spec_helper.rb
 - spec/support/engine_controller.rb
 - spec/support/factories.rb

data/lib/notifiable/batch.rb

@@ -1,54 +0,0 @@
-module Notifiable
-  class Batch
-    
-    def initialize(app)
-      raise "Must specify Notifiable::App" unless app
-      @app = app
-      @notifiers = {}
-      @notification_ids = []
-    end
-    
-    def add_notifiable(notification, notifiable)
-      notifiable.device_tokens.each do |d|
-        self.add_device_token(notification, d)
-      end
-    end
-    
-    def add_device_token(notification, d)
-      provider = d.provider.to_sym
-
-      unless @notifiers[provider]
-        clazz = Notifiable.notifier_classes[provider]          
-        raise "Notifier #{provider} not configured" unless clazz
-        @notifiers[provider] = clazz.new
-        @notifiers[provider].env = Rails.env
-        
-        if @app.configuration && @app.configuration[provider]
-          @app.configuration[provider].each_pair {|key, value| @notifiers[provider].send("#{key}=", value) if @notifiers[provider].methods.include?("#{key}=".to_sym) } 
-        end
-      end
-      
-      notifier = @notifiers[provider]
-      if d.is_valid? && !notifier.nil? 
-  		  notifier.send_notification(notification, d)
-        @notification_ids << notification.id
-      end
-    end
-    
-    def close
-      @notifiers.each_value {|n| n.close}
-      @notifiers = nil
-      summarise
-    end
-    
-    private
-    def summarise
-      notifications = Notification.where(:id => @notification_ids)
-      notifications.each do |n|
-        n.sent_count = n.notification_statuses.count
-        n.gateway_accepted_count = n.notification_statuses.where(:status => 0).count
-        n.save
-      end
-    end 
-  end
-end

data/spec/batch_spec.rb

@@ -1,65 +0,0 @@
-require 'spec_helper'
-
-describe Notifiable::Batch do
-  let(:user1) { FactoryGirl.create(:user) }
-  let(:notification) { FactoryGirl.create(:notification, :app => app) }
-  let(:app) { FactoryGirl.create(:app, :configuration => {:configurable_mock => {:use_sandbox => true}}) }
-  
-  it "adds a notifiable object" do  
-    FactoryGirl.create(:mock_token, :provider => :configurable_mock, :user_id => user1.id, :app => app)
-          
-    b = Notifiable::Batch.new(app)
-    b.add_notifiable(notification, user1)
-    b.close
-
-    Notifiable::NotificationStatus.count.should == 1
-    saved_notification = Notifiable::Notification.first
-    saved_notification.sent_count.should == 1
-    saved_notification.gateway_accepted_count.should == 1
-    saved_notification.opened_count.should == 0
-    
-    saved_status = Notifiable::NotificationStatus.first
-    saved_status.status.should == 0
-    saved_status.created_at.should_not be_nil
-  end
-  
-  it "adds a device token" do  
-    token = FactoryGirl.create(:mock_token, :provider => :configurable_mock, :user_id => user1.id, :app => app)
-          
-    b = Notifiable::Batch.new(app)
-    b.add_device_token(notification, token)
-    b.close
-
-    Notifiable::NotificationStatus.count.should == 1
-    saved_notification = Notifiable::Notification.first
-    saved_notification.sent_count.should == 1
-    saved_notification.gateway_accepted_count.should == 1
-  end
-  
-  it "configures the provider via an App" do  
-    FactoryGirl.create(:mock_token, :provider => :configurable_mock, :user_id => user1.id, :app => app)
-    
-    b = Notifiable::Batch.new(app)
-    b.add_notifiable(notification, user1)
-
-    b.notifiers[:configurable_mock].env.should eql Rails.env
-    b.notifiers[:configurable_mock].use_sandbox.should == true
-  end
-  
-end
-
-module Notifiable
-  class Batch
-    attr_accessor :notifiers
-  end
-end
-
-class ConfigurableMockNotifier < Notifiable::NotifierBase
-  attr_accessor :use_sandbox
-  
-  def enqueue(notification, device_token, message, params)
-    processed(notification, device_token, 0)
-  end
-end
-
-Notifiable.notifier_classes[:configurable_mock] = ConfigurableMockNotifier

data/spec/notifiable_server_spec.rb

@@ -1,55 +0,0 @@
-require 'spec_helper'
-
-describe Notifiable do
-  let(:user1) { FactoryGirl.create(:user_with_mock_token) }
-  let(:user2) { FactoryGirl.create(:user_with_mock_token) }
-  let(:notification1) { FactoryGirl.create(:notification, :message => "First test message")}
-  let(:notification2) { FactoryGirl.create(:notification, :message => "Second test message")}
-  
-  before(:each) { FactoryGirl.create(:app) }
-  
-  it "sends two identical push notifications" do
-    Notifiable.batch do |b|
-      b.add_notifiable(notification1, user1)
-      b.add_notifiable(notification1, user2)
-    end
-
-    Notifiable::NotificationStatus.count.should == 2
-    
-    all_notifications = Notifiable::NotificationStatus.all
-    first_notification_token = all_notifications[0]
-    first_notification_token.notification.message.should eql "First test message"
-    first_notification_token.device_token.should eql user1.device_tokens[0]
-    
-    second_notification_token = all_notifications[1]
-    second_notification_token.notification.message.should eql "First test message"
-    second_notification_token.device_token.should eql user2.device_tokens[0]
-  end
-  
-  it "sends two different push notifications" do
-    Notifiable.batch do |b|
-      b.add_notifiable(notification1, user1)
-      b.add_notifiable(notification2, user2)
-    end
-    
-    Notifiable::NotificationStatus.count.should == 2
-    
-    all_notifications = Notifiable::NotificationStatus.all
-    first_notification_token = all_notifications[0]
-    first_notification_token.status.should == 200
-    first_notification_token.notification.message.should eql "First test message"
-    first_notification_token.device_token.should eql user1.device_tokens[0]
-    
-    second_notification_token = all_notifications[1]
-    second_notification_token.status.should == 200
-    second_notification_token.notification.message.should eql "Second test message"
-    second_notification_token.device_token.should eql user2.device_tokens[0]
-  end
-  
-  it "raises an error if it can't find the notification provider" do
-    user = FactoryGirl.create(:user)
-    device_token = FactoryGirl.create(:mock_token, :provider => :sms, :user_id => user.id)
-    
-    expect { user.send_notification(notification1) }.to raise_error    
-  end
-end