notifiable-rails 0.19.9 → 0.20.0

data/spec/model/notifiable_app_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Notifiable::App do
+  describe "#notifications" do
+    subject(:notifiable_app) { create(:app) }
+    let!(:notification) { create(:notification, :app => notifiable_app) }
+    
+    it { expect(notification.app).to_not be_nil }
+    it { expect(notifiable_app.notifications.count).to eq 1 }
+  end
+  
+  describe "#configure" do
+    let(:notification) { create(:notification, :app => notifiable_app) }
+    let(:notifier) { ConfigurableMockNotifier.new(Rails.env, notification) }
+    subject(:notifiable_app) { create(:app, :configuration => {:configurable_mock => {:use_sandbox => true}}) }
+    
+    before(:each) { notifiable_app.configure :configurable_mock, notifier }
+    
+    it { expect(notifier.use_sandbox).to eq true }
+  end
+end
+
+class ConfigurableMockNotifier < Notifiable::NotifierBase
+  attr_accessor :use_sandbox
+end

data/spec/model/notifiable_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Notifiable::Concern do
+    
+  describe "#send_notification" do
+    
+    context "single" do
+      let(:user1) { create(:user_with_mock_token) }
+      let(:notification1) { create(:notification, :message => "First test message")} 
+      
+      before(:each) { user1.send_notification(notification1) }
+      
+      it { expect(Notifiable::NotificationStatus.count).to eq 1 }     
+    end
+    
+    context "invalid device" do
+      let(:user1) { FactoryGirl.create(:user_with_invalid_mock_token) }
+      let(:notification1) { create(:notification, :message => "First test message")} 
+    
+      before(:each) { user1.send_notification(notification1) }
+      
+      it { expect(Notifiable::NotificationStatus.count).to eq 0 }     
+    end    
+  end
+end

data/spec/model/notification_spec.rb

@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+describe Notifiable::Notification 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")}
+  
+  describe "#message" do
+    subject!(:n) { create(:notification, :message => "Test message") }
+    
+    it { expect(Notifiable::Notification.first.message).to eq "Test message" }
+  end
+  
+  describe "#params" do
+    subject!(:n) { create(:notification, :params => {:custom_property => "A different message"}) }
+    
+    it { expect(Notifiable::Notification.first.params).to eq({:custom_property => "A different message"}) }
+  end
+  
+  describe "#destroy" do
+    subject(:n) { create(:notification) }
+    let!(:s) { create(:notification_status, :notification => n) }
+    
+    before(:each) { n.destroy }
+    
+    it { expect(Notifiable::NotificationStatus.count).to eq 0 }
+  end
+  
+  describe "#add_notifiable" do
+    context "for a single user" do
+      subject(:notification) { create(:notification) }
+      let(:u) { create(:user_with_mock_token) }
+    
+      before(:each) do
+        notification1.batch do |n|
+          n.add_notifiable(u)
+        end      
+      end
+    
+      it { expect(Notifiable::Notification.first.sent_count).to eq 1 }
+      it { expect(Notifiable::Notification.first.gateway_accepted_count).to eq 1 }
+      it { expect(Notifiable::Notification.first.opened_count).to eq 0 }    
+      it { expect(Notifiable::NotificationStatus.count).to eq 1 }  
+      it { expect(Notifiable::NotificationStatus.first.status).to eq 0 }
+      it { expect(Notifiable::NotificationStatus.first.created_at).to_not be_nil }
+    end
+    
+    context "for two users" do
+      subject(:notification) { create(:notification) }
+      let(:u1) { create(:user_with_mock_token) }
+      let(:u2) { create(:user_with_mock_token) }
+    
+      before(:each) do
+        notification1.batch do |n|
+          n.add_notifiable(u1)
+          n.add_notifiable(u2)
+        end      
+      end
+    
+      it { expect(Notifiable::Notification.first.sent_count).to eq 2 }
+      it { expect(Notifiable::Notification.first.gateway_accepted_count).to eq 2 }
+      it { expect(Notifiable::Notification.first.opened_count).to eq 0 }    
+      it { expect(Notifiable::NotificationStatus.count).to eq 2 }  
+      it { expect(Notifiable::NotificationStatus.first.status).to eq 0 }
+      it { expect(Notifiable::NotificationStatus.first.created_at).to_not be_nil }
+      it { expect(Notifiable::NotificationStatus.last.status).to eq 0 }
+      it { expect(Notifiable::NotificationStatus.last.created_at).to_not be_nil }
+    end 
+  
+  end
+  
+  describe "#add_device_token" do
+    context "single token" do
+      subject(:n) { create(:notification) }
+      let(:dt) { create(:mock_token) }
+    
+      before(:each) { notification1.batch {|n| n.add_device_token(dt) } }
+    
+      it { expect(Notifiable::Notification.first.sent_count).to eq 1 }
+      it { expect(Notifiable::Notification.first.gateway_accepted_count).to eq 1 }
+      it { expect(Notifiable::Notification.first.opened_count).to eq 0 }    
+      it { expect(Notifiable::NotificationStatus.count).to eq 1 }  
+      it { expect(Notifiable::NotificationStatus.first.status).to eq 0 }
+      it { expect(Notifiable::NotificationStatus.first.created_at).to_not be_nil }
+    end
+    
+    context "undefined provider" do
+      subject(:n) { create(:notification) }
+      let(:dt) { create(:mock_token, :provider => :sms) }
+      
+      before(:each) do
+        notification1.batch do |n|      
+          begin    
+            n.add_device_token(unconfigured_device_token)
+          rescue
+          end      
+        end
+      end
+
+      it { expect(Notifiable::NotificationStatus.count).to eq 0 }
+    end   
+  end
+end

data/spec/model/notifier_base_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Notifiable::NotifierBase do
+
+  describe "#test_env?" do
+    let(:notifiable_app) { FactoryGirl.create(:app, :configuration => {:configurable_mock => {:use_sandbox => true}}) }
+    let(:notification) { FactoryGirl.create(:notification, :app => notifiable_app) }
+    subject(:notifier) { ConfigurableMockNotifier.new(Rails.env, notification) }
+    
+    before(:each) { ConfigurableMockNotifier.send(:public, *ConfigurableMockNotifier.protected_instance_methods) }  
+
+    it { expect(notifier.test_env?).to eq true }
+  end
+end
+
+class ConfigurableMockNotifier < Notifiable::NotifierBase
+  attr_accessor :use_sandbox
+end

data/spec/spec_helper.rb

@@ -14,7 +14,6 @@ require File.expand_path("../../lib/notifiable",  __FILE__)
 require File.expand_path("../../app/controllers/notifiable/device_tokens_controller",  __FILE__)
 require 'database_cleaner'
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'factory_girl_rails'
 
 Rails.backtrace_cleaner.remove_silencers!
@@ -23,14 +22,29 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 DatabaseCleaner.strategy = :truncation
 
+ActiveRecord::Migrator.migrate(File.join(Rails.root, 'db/migrate'))
+
 RSpec.configure do |config|  
   config.mock_with :rspec
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
   config.order = "random"
+  
+  # For testing engines
   config.include EngineControllerTestMonkeyPatch, :type => :controller
+  
+  # JsonHelpers for controllers
   config.include Requests::JsonHelpers, :type => :controller
   
+  # Remove need for factory girl prefix
+  config.include FactoryGirl::Syntax::Methods
+  
+  # errors for deprecations
+  #config.raise_errors_for_deprecations!
+  
+  # Infer the spec type from the containing folder
+  config.infer_spec_type_from_file_location!
+  
   config.before(:each) {
     DatabaseCleaner.start
     Notifiable.delivery_method = :send

data/spec/test_app/app/controllers/application_controller.rb

@@ -1,5 +1,7 @@
 class ApplicationController < ActionController::Base
   
+  include ActionController::MimeResponds
+  
   respond_to :json
   
   def current_notifiable_user

data/spec/test_app/config/database.yml

@@ -26,5 +26,11 @@ test:
   database: db/test.sqlite3
   pool: 5
   timeout: 5000
+  
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
 
 

data/spec/test_app/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20131229104039) do
+ActiveRecord::Schema.define(version: 20131210115652) do
 
   create_table "notifiable_apps", force: true do |t|
     t.string   "name"
@@ -30,7 +30,7 @@ ActiveRecord::Schema.define(version: 20131229104039) do
     t.datetime "updated_at"
   end
 
-  add_index "notifiable_device_tokens", ["token"], name: "index_notifiable_device_tokens_on_token"
+  add_index "notifiable_device_tokens", ["token"], name: "index_notifiable_device_tokens_on_token", unique: true
   add_index "notifiable_device_tokens", ["user_id"], name: "index_notifiable_device_tokens_on_user_id"
 
   create_table "notifiable_notifications", force: true do |t|

data/spec/test_app/log/development.log

@@ -1646567,3 +1646567,189 @@ Could not log "sql.active_record" event. Interrupt:  ["/Users/matt/.rvm/gems/rub
    (0.2ms)  BEGIN
   SQL (0.7ms)  DELETE FROM "notifiable_notifications" WHERE "notifiable_notifications"."id" = $1  [["id", 6]]
    (0.5ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.5ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (7.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (7.6ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateNotifiableApps (20131210115648)
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "notifiable_apps" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "configuration" text, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131210115648"]]
+   (0.8ms)  commit transaction
+Migrating to CreateNotifiableDeviceTokens (20131210115649)
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "notifiable_device_tokens" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "token" varchar(255), "provider" varchar(255), "is_valid" boolean DEFAULT 't', "user_id" integer, "app_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  select sqlite_version(*)
+   (0.7ms)  CREATE UNIQUE INDEX "index_notifiable_device_tokens_on_token" ON "notifiable_device_tokens" ("token")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+
+   (0.1ms)  CREATE  INDEX "index_notifiable_device_tokens_on_user_id" ON "notifiable_device_tokens" ("user_id")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131210115649"]]
+   (1.0ms)  commit transaction
+Migrating to CreateNotifiableNotifications (20131210115650)
+   (0.0ms)  begin transaction
+   (0.2ms)  CREATE TABLE "notifiable_notifications" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "message" text, "params" text, "app_id" integer, "sent_count" integer DEFAULT 0, "gateway_accepted_count" integer DEFAULT 0, "opened_count" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131210115650"]]
+   (0.7ms)  commit transaction
+Migrating to CreateNotifiableStatuses (20131210115651)
+   (0.0ms)  begin transaction
+   (0.2ms)  CREATE TABLE "notifiable_statuses" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "notification_id" integer, "device_token_id" integer, "status" integer, "created_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131210115651"]]
+   (0.7ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_notifiable_device_tokens_on_user_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_notifiable_device_tokens_on_user_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_notifiable_device_tokens_on_user_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_notifiable_device_tokens_on_user_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_notifiable_device_tokens_on_user_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_notifiable_device_tokens_on_user_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateUsers (20131210115652)
+   (0.0ms)  begin transaction
+   (0.4ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131210115652"]]
+   (1.9ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_notifiable_device_tokens_on_user_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_notifiable_device_tokens_on_user_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+
+  User Load (0.1ms)  SELECT  "users".* FROM "users"   ORDER BY "users"."id" ASC LIMIT 1
+  Notifiable::DeviceToken Load (0.2ms)  SELECT "notifiable_device_tokens".* FROM "notifiable_device_tokens"
+   (7.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateNotifiableApps (20131210115648)
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "notifiable_apps" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "configuration" text, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131210115648"]]
+   (0.8ms)  commit transaction
+Migrating to CreateNotifiableDeviceTokens (20131210115649)
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "notifiable_device_tokens" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "token" varchar(255), "provider" varchar(255), "is_valid" boolean DEFAULT 't', "user_id" integer, "app_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (0.8ms)  CREATE UNIQUE INDEX "index_notifiable_device_tokens_on_token" ON "notifiable_device_tokens" ("token")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+
+   (0.1ms)  CREATE  INDEX "index_notifiable_device_tokens_on_user_id" ON "notifiable_device_tokens" ("user_id")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131210115649"]]
+   (0.7ms)  commit transaction
+Migrating to CreateNotifiableNotifications (20131210115650)
+   (0.0ms)  begin transaction
+   (0.2ms)  CREATE TABLE "notifiable_notifications" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "message" text, "params" text, "app_id" integer, "sent_count" integer DEFAULT 0, "gateway_accepted_count" integer DEFAULT 0, "opened_count" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131210115650"]]
+   (0.6ms)  commit transaction
+Migrating to CreateNotifiableStatuses (20131210115651)
+   (0.0ms)  begin transaction
+   (0.2ms)  CREATE TABLE "notifiable_statuses" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "notification_id" integer, "device_token_id" integer, "status" integer, "created_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131210115651"]]
+   (0.5ms)  commit transaction
+Migrating to CreateUsers (20131210115652)
+   (0.0ms)  begin transaction
+   (0.2ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131210115652"]]
+   (0.6ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_notifiable_device_tokens_on_user_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_notifiable_device_tokens_on_user_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_notifiable_device_tokens_on_token' AND type='index'
+