notifiable-rails 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d30b25ba3440af53de4b2bd74294a3c7d927af
-  data.tar.gz: b093120437a3319b16eb1df279647992bdd3fed8
+  metadata.gz: 6b4955923e80912ffec3e18234d87fb942380a8b
+  data.tar.gz: c4b3b65c9c917b88f35705118a65988eca07327a
 SHA512:
-  metadata.gz: 1b99297db23479355e730fa763fe73fc669f25ce998c4baae6c0edd00c6e1a1c3496110179d08c60f3b3cea335e7e6cf5ece37dbcb2e0eb20fb579531f2f359e
-  data.tar.gz: 47f8a1c753ce0f59c8e14d24296330ebcb5aebdeea1a00d147d5302e1f0f7fd33e77a5e6d987a503749877658eec6d4576b6e5f7d334449a0568c6ce6649a2a6
+  metadata.gz: 72aab818f6684b44bb6f3a32745f09746391a357209495e34744f44dbaf8051586583134ecbbb08ea62ef23278ca648020d6c1c845b129dfb0bb1e4c43779ece
+  data.tar.gz: cf21d9790ee894059d9cf6dc384864e491bed33ffee9a39347ad93c04dd5ca2aa061500998b9363b8caca32d51a17281ca3d64aa06b25a1700c576e1aabcc2fd

data/lib/generators/notifiable/install/templates/initializer.rb

@@ -1,44 +1,10 @@
 Notifiable.configure do |config|
 
-  #
-	# Rails Engine
-  #
-  
   # The controller class that the DeviceTokenController should extend
 	config.api_controller_class = ApplicationController
   
   # The class representing the holder of the device
 	config.user_class = User
-
-  #
-	# APNS
-  #
-  
-  # The path to your apns private key
-	config.apns_certificate = File.join(Rails.root, 'config', 'apns-production.pem')
-  
-  # The passphrase for your private key
-  # Defaults to nil
-	#config.apns_passphrase = 'YOUR-PASSPHRASE-HERE'
-	
-  # The apns gateway to use
-  # Defaults to 'gateway.push.apple.com', can also be 'gateway.sandbox.push.apple.com'
-  #config.apns_gateway = 'gateway.push.apple.com'
-	
-  #
-	# GCM
-  #
-  
-  # Your GCM API Key
-	#config.gcm_api_key = 'YOUR-KEY-HERE'
-  
-  # The batch size
-  # Defaults to 1000
-  #config.gcm_batch_size = 1000
-  
-  #
-  # Global
-  #
   
   # Set the delivery method to test, preventing notifications from being sent
   # Defaults to :send

data/lib/notifiable/batch.rb

@@ -2,8 +2,9 @@ module Notifiable
   class Batch
     attr_accessor :notifiers
     
-    def initialize
+    def initialize(config = {})
       @notifiers = {}
+      @config = config
     end
     
     def add(notification, user)
@@ -11,9 +12,11 @@ module Notifiable
         provider = d.provider.to_sym
         
         unless @notifiers[provider]
-          clazz = Notifiable.notifier_classes[provider]
+          clazz = Notifiable.notifier_classes[provider]          
           raise "Notifier #{provider} not configured" unless clazz
           @notifiers[provider] = clazz.new
+          @notifiers[provider].env = Rails.env
+          @config[provider].each_pair {|key, value| @notifiers[provider].send("#{key}=", value) if @notifiers[provider].methods.include?("#{key}=".to_sym) } if @config[provider]
         end
         
         notifier = @notifiers[provider]

data/lib/notifiable/notification.rb

@@ -5,8 +5,12 @@ module Notifiable
     
     has_many :notification_device_tokens, :class_name => 'Notifiable::NotificationDeviceToken'
     
-    def apns_message
-      @apns_message ||= (self.message.bytesize > 232 ? "#{self.message.byteslice(0, 229)}..." : self.message)
+    def provider_value(provider, key)
+      if self.payload && self.payload[provider] && self.payload[provider][key]
+        self.payload[provider][key]
+      elsif self.respond_to? key
+        self.send(key)
+      end       
     end
   end
 end

data/lib/notifiable/notifier_base.rb

@@ -2,6 +2,8 @@ module Notifiable
 
 	class NotifierBase
     
+    attr_accessor :env
+    
 		def send_notification(notification, device_token)
       # todo - add before hook
       enqueue(notification, device_token)
@@ -13,7 +15,7 @@ module Notifiable
       save_receipts
     end
     
-    protected
+    protected    
     def flush
       
     end
@@ -26,6 +28,10 @@ module Notifiable
       end
     end
     
+    def test_env?
+      self.env == "test"
+    end
+    
     private
     def receipts
       @receipts ||= []

data/lib/notifiable/version.rb

@@ -1,3 +1,3 @@
 module Notifiable
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/notifiable.rb

@@ -13,18 +13,6 @@ module Notifiable
   mattr_accessor :api_controller_class
 
   mattr_accessor :user_class
-
-  mattr_accessor :apns_gateway
-  @@apns_gateway = 'gateway.push.apple.com'
-
-  mattr_accessor :apns_certificate
-
-  mattr_accessor :apns_passphrase
-
-  mattr_accessor :gcm_api_key
-
-  mattr_accessor :gcm_batch_size
-  @@gcm_batch_size = 1000
   
   mattr_accessor :delivery_method
   @@delivery_method = :send
@@ -35,32 +23,12 @@ module Notifiable
   def self.configure
     yield self
   end
-
-  def self.apns_gateway_config
-    {
-      :gateway => apns_gateway,
-      :certificate => apns_certificate,
-      :passphrase => apns_passphrase
-    }
-  end
-  
-  def self.apns_feedback_config
-    {
-      :gateway => self.apns_gateway_config[:gateway].gsub('gateway', 'feedback'),
-      :certificate => self.apns_gateway_config[:certificate],
-      :passphrase => self.apns_gateway_config[:passphrase]
-    }
-  end
   
-  def self.batch()
-    b = Batch.new
+  def self.batch(config = {})    
+    b = Batch.new(config)
     yield(b)
     b.close
   end
-  
-  def self.env
-    Rails.env || 'development'
-  end
 
 end
 

data/spec/batch_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Notifiable::Batch do
+  let(:user1) { FactoryGirl.create(:user) }
+  let(:notification) { Notifiable::Notification.new(:message => "Test message")}
+  
+  it "configures the provider" do  
+    FactoryGirl.create(:mock_token, :provider => :configurable_mock, :user_id => user1.id)
+      
+    config = {:configurable_mock => {:use_sandbox => true}}
+    
+    b = Notifiable::Batch.new(config)
+    b.add(notification, user1)
+
+    b.notifiers[:configurable_mock].env.should eql Rails.env
+    b.notifiers[:configurable_mock].use_sandbox.should == true
+  end
+  
+end
+
+class ConfigurableMockNotifier < Notifiable::NotifierBase
+  attr_accessor :use_sandbox
+  
+  def enqueue(notification, device_token)
+    processed(notification, device_token)
+  end
+end
+
+Notifiable.notifier_classes[:configurable_mock] = ConfigurableMockNotifier

data/spec/notifiable_server_spec.rb

@@ -16,11 +16,11 @@ describe Notifiable do
     
     all_notifications = Notifiable::NotificationDeviceToken.all
     first_notification_token = all_notifications[0]
-    first_notification_token.notification.apns_message.should eql "First test message"
+    first_notification_token.notification.provider_value(:mock, :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.apns_message.should eql "First test message"
+    second_notification_token.notification.provider_value(:mock, :message).should eql "First test message"
     second_notification_token.device_token.should eql user2.device_tokens[0]
   end
   
@@ -34,27 +34,14 @@ describe Notifiable do
     
     all_notifications = Notifiable::NotificationDeviceToken.all
     first_notification_token = all_notifications[0]
-    first_notification_token.notification.apns_message.should eql "First test message"
+    first_notification_token.notification.provider_value(:mock, :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.apns_message.should eql "Second test message"
+    second_notification_token.notification.provider_value(:mock, :message).should eql "Second test message"
     second_notification_token.device_token.should eql user2.device_tokens[0]
   end
   
-  it "truncates long apns messages" do
-    
-    long_notification = Notifiable::Notification.create(:message => "First test message First test message First test message First test message First test message First test message First test message First test message First test message First test message First test message First test message First test message First test message First test message First test message First test message end")
-    
-    user1.send_notification(long_notification)
-    
-    Notifiable::NotificationDeviceToken.count.should == 1
-    
-    all_notifications = Notifiable::NotificationDeviceToken.all
-    first_notification_token = all_notifications[0]
-    first_notification_token.notification.apns_message.should eql "First test message First test message First test message First test message First test message First test message First test message First test message First test message First test message First test message First test message F..."
-  end
-  
   it "raises an error if it can't find the notification provider" do
     user = FactoryGirl.create(:user)
     Notifiable::DeviceToken.create :user_id => user.id, :token => "DEF567", :provider => :gcm

data/spec/notification_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Notifiable::Notification do
+  
+  it "stores a message" do    
+    Notifiable::Notification.create :message => "Test message"
+    
+    Notifiable::Notification.first.provider_value(:mock, :message).should eql "Test message"
+  end
+  
+  it "overrides a message" do    
+    Notifiable::Notification.create :message => "Test message", :payload => {:mock => {:message => "A different message"}}
+    
+    Notifiable::Notification.first.provider_value(:mock, :message).should eql "A different message"
+  end
+  
+  it "returns nil for a property that doesnt exist" do    
+    Notifiable::Notification.create :message => "Test message"
+    
+    Notifiable::Notification.first.provider_value(:mock, :sound).should be_nil
+  end
+  
+end

data/spec/test_app/config/environments/test.rb

@@ -33,11 +33,4 @@ TestApp::Application.configure do
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
-
-  Notifiable.configure do |config|
-    config.apns_certificate = nil
-    config.apns_gateway = "localhost"
-    config.apns_passphrase = nil
-  end
-
 end

data/spec/test_app/config/initializers/notifiable.rb

@@ -1,44 +1,10 @@
 Notifiable.configure do |config|
 
-  #
-	# Rails Engine
-  #
-  
   # The controller class that the DeviceTokenController should extend
 	config.api_controller_class = ApplicationController
   
   # The class representing the holder of the device
 	config.user_class = User
-
-  #
-	# APNS
-  #
-  
-  # The path to your apns private key
-	config.apns_certificate = File.join(Rails.root, 'config', 'apns-development.pem')
-  
-  # The passphrase for your private key
-  # Defaults to nil
-	#config.apns_passphrase = 'YOUR-PASSPHRASE-HERE'
-	
-  # The apns gateway to use
-  # Defaults to 'gateway.push.apple.com', can also be 'gateway.sandbox.push.apple.com'
-  #config.apns_gateway = 'gateway.push.apple.com'
-	
-  #
-	# GCM
-  #
-  
-  # Your GCM API Key
-	#config.gcm_api_key = 'YOUR-KEY-HERE'
-  
-  # The batch size
-  # Defaults to 1000
-  #config.gcm_batch_size = 1000
-  
-  #
-  # Global
-  #
   
   # Set the delivery method to test, preventing notifications from being sent
   # Defaults to :send