user_notifier 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdd2ab094e02c99e723edbbe759fdb9e1f89e043
-  data.tar.gz: bdaf02d80f56b0a8bc36f2a3f8baf64d7739daed
+  metadata.gz: 6cb454c6c1c482a948d1f588878a24833712fd1a
+  data.tar.gz: 0cad09d1c573dd3d186c2d98250c9dcbf6fc8088
 SHA512:
-  metadata.gz: 2210ddc1d6217c723e64cbb9d0bd473eae06fe891b69148bf40ff2343082d1e9137dc1ba88c68cc6453c5855713c68eb2d906324e9015fd4fa35f28cb2df1b51
-  data.tar.gz: 8352e2a9266fb860f0e8196084f07a66210f35e15f095f5465aef015d182f911fdb8582b5ef3f842b8fbd38ef107f23c73766a8b58d890ace4be42e161b4f00d
+  metadata.gz: 4b60d65e3695cb8a5372a3321c7558d853e180c303e65a1225edfe0b03c17b55b3e9193e6ca70362a94d04bdac11669bdb7cd0399f7fb1cb5fc8f1213774935a
+  data.tar.gz: 5af36e65df4dac3b6b12b0e5e560ecd9dcd7e105f8bcb87d01cadec812df38e37e673902fab480e8a0c125564eaf14eaac8920d8694164129f0b966767dd5dec

data/lib/generators/user_notifier/notification/templates/migration.rb

@@ -8,6 +8,7 @@ class Create<%= notifications_table_name.camelize %> < ActiveRecord::Migration
       t.text :template_name, null: false
       t.text :locale, null: false
       t.timestamp :sent_at
+      t.timestamp :deliver_at
       t.timestamps
     end
   end

data/lib/user_notifier/models/base.rb

@@ -23,7 +23,7 @@ class UserNotifier::Base < ActiveRecord::Base
   end
 
   def deliver!
-    UserNotifier::EmailWorker.perform_async(self.class.name.to_s, self.id)
+    UserNotifier::EmailWorker.perform_at((self.try(:deliver_at) || Time.now), self.class.name.to_s, self.id)
   end
 
   def deliver_without_worker

data/lib/user_notifier/version.rb

@@ -1,3 +1,3 @@
 module UserNotifier
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/dummy/config/database.yml

@@ -1,25 +1,45 @@
-# SQLite version 3.x
-#   gem install sqlite3
+# PostgreSQL. Versions 9.1 or later are supported.
 #
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
+# Install the pg driver:
+#   gem install pg
+# On Mac OS X with macports:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
 development:
-  adapter: sqlite3
-  database: db/development.sqlite3
+  adapter: postgresql
+  encoding: unicode
+  host: localhost
+  database: user_notifier_development
   pool: 5
-  timeout: 5000
+  username: postgres
+
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # The server defaults to notice.
+  #min_messages: warning
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
 
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
+test:
+  adapter: postgresql
+  encoding: unicode
+  host: localhost
+  database: user_notifier_test
   pool: 5
-  timeout: 5000
+  username: postgres

data/spec/dummy/db/migrate/20150713180329_add_deliver_at_to_notifications.rb

@@ -0,0 +1,14 @@
+class AddDeliverAtToNotifications < ActiveRecord::Migration
+  def up
+    add_column :order_notifications, :deliver_at, :timestamp
+    add_column :user_notifications, :deliver_at, :timestamp
+
+    execute "ALTER TABLE order_notifications ALTER deliver_at SET DEFAULT current_timestamp"
+    execute "ALTER TABLE user_notifications ALTER deliver_at SET DEFAULT current_timestamp"
+  end
+
+  def down
+    remove_column :order_notifications, :deliver_at, :timestamp
+    remove_column :user_notifications, :deliver_at, :timestamp
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,16 +11,20 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140709170259) do
+ActiveRecord::Schema.define(version: 20150713180329) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
 
   create_table "order_notifications", force: :cascade do |t|
-    t.integer  "user_id",       null: false
-    t.integer  "order_id",      null: false
-    t.text     "from_email",    null: false
-    t.text     "from_name",     null: false
-    t.text     "template_name", null: false
-    t.text     "locale",        null: false
+    t.integer  "user_id",                         null: false
+    t.integer  "order_id",                        null: false
+    t.text     "from_email",                      null: false
+    t.text     "from_name",                       null: false
+    t.text     "template_name",                   null: false
+    t.text     "locale",                          null: false
     t.datetime "sent_at"
+    t.datetime "deliver_at",    default: "now()"
   end
 
   create_table "orders", force: :cascade do |t|
@@ -37,6 +41,7 @@ ActiveRecord::Schema.define(version: 20140709170259) do
     t.text     "template_name"
     t.text     "locale"
     t.datetime "sent_at"
+    t.datetime "deliver_at",    default: "now()"
   end
 
   create_table "users", force: :cascade do |t|

data/spec/dummy/log/development.log

@@ -37,3 +37,152 @@ Migrating to CreateOrderNotifications (20140709170259)
    (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140625163719')
    (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140625183616')
    (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140709164530')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (4.3ms)  CREATE TABLE "schema_migrations" ("version" character varying NOT NULL) 
+   (1.4ms)  CREATE UNIQUE INDEX  "unique_schema_migrations" ON "schema_migrations"  ("version")
+  ActiveRecord::SchemaMigration Load (0.6ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateUsers (20140625163719)
+   (0.2ms)  BEGIN
+DEPRECATION WARNING: `#timestamps` was called without specifying an option for `null`. In Rails 5, this behavior will change to `null: false`. You should manually specify `null: true` to prevent the behavior of your existing migrations from changing. (called from block in change at /Users/diogo/Projects/user_notifier/spec/dummy/db/migrate/20140625163719_create_users.rb:7)
+   (4.8ms)  CREATE TABLE "users" ("id" serial primary key, "name" text, "email" text, "created_at" timestamp, "updated_at" timestamp) 
+  SQL (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20140625163719"]]
+   (0.5ms)  COMMIT
+Migrating to CreateUserNotifications (20140625183616)
+   (0.3ms)  BEGIN
+   (4.2ms)  CREATE TABLE "user_notifications" ("id" serial primary key, "user_id" integer, "from_email" text, "from_name" text, "template_name" text, "locale" text, "sent_at" timestamp) 
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20140625183616"]]
+   (0.6ms)  COMMIT
+Migrating to CreateOrders (20140709164530)
+   (0.4ms)  BEGIN
+DEPRECATION WARNING: `#timestamps` was called without specifying an option for `null`. In Rails 5, this behavior will change to `null: false`. You should manually specify `null: true` to prevent the behavior of your existing migrations from changing. (called from block in change at /Users/diogo/Projects/user_notifier/spec/dummy/db/migrate/20140709164530_create_orders.rb:7)
+   (5.8ms)  CREATE TABLE "orders" ("id" serial primary key, "user_id" integer, "title" text, "created_at" timestamp, "updated_at" timestamp) 
+  SQL (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20140709164530"]]
+   (0.5ms)  COMMIT
+Migrating to CreateOrderNotifications (20140709170259)
+   (0.4ms)  BEGIN
+   (6.0ms)  CREATE TABLE "order_notifications" ("id" serial primary key, "user_id" integer NOT NULL, "order_id" integer NOT NULL, "from_email" text NOT NULL, "from_name" text NOT NULL, "template_name" text NOT NULL, "locale" text NOT NULL, "sent_at" timestamp) 
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20140709170259"]]
+   (0.5ms)  COMMIT
+Migrating to AddDeliverAtToNotifications (20150713180329)
+   (0.4ms)  BEGIN
+   (1.1ms)  ALTER TABLE "order_notifications" ADD "deliver_at" timestamp
+   (1.5ms)  ALTER TABLE "user_notifications" ADD "deliver_at" timestamp
+   (1.5ms)  ALTER TABLE order_notifications ALTER deliver_at SET DEFAULT current_timestamp
+   (1.0ms)  ALTER TABLE user_notifications ALTER deliver_at SET DEFAULT current_timestamp
+  SQL (0.5ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20150713180329"]]
+   (0.6ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (5.5ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'order_notifications'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (4.6ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'orders'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (5.0ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'user_notifications'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (4.7ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'users'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+  ActiveRecord::SchemaMigration Load (0.6ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (4.0ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'order_notifications'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (3.5ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'orders'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (3.3ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'user_notifications'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (3.4ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'users'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (120.6ms)  DROP DATABASE IF EXISTS "user_notifier_test"
+   (243.4ms)  CREATE DATABASE "user_notifier_test" ENCODING = 'unicode'
+  SQL (0.4ms)  CREATE EXTENSION IF NOT EXISTS "plpgsql"
+   (7.1ms)  CREATE TABLE "order_notifications" ("id" serial primary key, "user_id" integer NOT NULL, "order_id" integer NOT NULL, "from_email" text NOT NULL, "from_name" text NOT NULL, "template_name" text NOT NULL, "locale" text NOT NULL, "sent_at" timestamp, "deliver_at" timestamp DEFAULT 'now()') 
+   (4.8ms)  CREATE TABLE "orders" ("id" serial primary key, "user_id" integer, "title" text, "created_at" timestamp, "updated_at" timestamp) 
+   (4.4ms)  CREATE TABLE "user_notifications" ("id" serial primary key, "user_id" integer, "from_email" text, "from_name" text, "template_name" text, "locale" text, "sent_at" timestamp, "deliver_at" timestamp DEFAULT 'now()') 
+   (5.4ms)  CREATE TABLE "users" ("id" serial primary key, "name" text, "email" text, "created_at" timestamp, "updated_at" timestamp) 
+   (2.3ms)  CREATE TABLE "schema_migrations" ("version" character varying NOT NULL) 
+   (1.3ms)  CREATE UNIQUE INDEX  "unique_schema_migrations" ON "schema_migrations"  ("version")
+   (0.4ms)  SELECT version FROM "schema_migrations"
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150713180329')
+   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140625163719')
+   (0.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140625183616')
+   (0.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140709164530')
+   (0.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140709170259')