dripper_mail 0.0.10 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7229cafc0a753c98f305704d6a8e9c96c5fcc603
-  data.tar.gz: 23f8374124ad4802773d9b792e099b42f5f3d7c1
+  metadata.gz: 666c5a38422a54f7f98c2aa48a3279625f6190e2
+  data.tar.gz: 279cb368237e5bbb4e6c92c8c647ce0b4b72e892
 SHA512:
-  metadata.gz: 7f24f92c4b97024c0a3773d7c806c965acd26f8552bdcf4bfeb6fe54d50aa7b9f09ff9d122d3141c5d1d8d5424711a0da298b26ea0a2bbab179486a2d71f2789
-  data.tar.gz: 4b845d6dd342f274ee3e1971c7f2a4c43133a355825875b238936448fa447c94b5160aa051a61e3f898faa285d8db0a3426d5a19720f16b77e725e4c573cc386
+  metadata.gz: eab05228783f050decb81acc85e5dbe50bf3440686fb552a346fdecd44e87bb90ab8432597063335d53a71a5adc52e9617824ac5aee4af78cf55856a436327a9
+  data.tar.gz: ae3742b6dc5f045048b467acbed9302735cfd6f6a9237268556c91d6eac57518c8fb1807a87464ae05bf6c013e354ca192ef8d427372e98d9c54d486c665588a

data/lib/dripper/drippable.rb

@@ -4,6 +4,8 @@ module Dripper
 
     included do
       after_create :execute_drippers
+      after_update :execute_drippers
+      after_touch :execute_drippers
 
       def execute_drippers
         DripperJob.perform_later self

data/lib/dripper/version.rb

@@ -1,3 +1,3 @@
 module Dripper
-  VERSION = "0.0.10"
+  VERSION = "0.0.16"
 end

data/lib/dripper_mail.rb

@@ -53,7 +53,7 @@ class DripperProxy
       if opts[:scope]
         instance_variable_set "@scope", self.parent.scope.merge(opts[:scope])
       else
-        instance_variable_ste "@scope", self.parent.scope
+        instance_variable_set "@scope", self.parent.scope
       end
     end
 
@@ -75,7 +75,8 @@ class DripperProxy
     Dripper::Action.where(action: self.action.to_s, mailer: self.mailer.to_s).first_or_create
   end
 
-  def execute(item = nil)
+  def scoped_recs(item = nil)
+
     dripper_action = Dripper::Action.find_by(action: self.action.to_s, mailer: self.mailer.to_s)
 
     all_recs = self.model.to_s.classify.constantize.send(:all)
@@ -85,17 +86,23 @@ class DripperProxy
       .where(drippable_type: self.model.to_s.classify.to_s, dripper_action_id: dripper_action.id)
       .select(:drippable_id)
 
-    scoped_recs =  all_recs
+    final_scope = all_recs
       .merge(self.scope)
       .where.not(id: already_sent)
       .where("#{self.model.to_s.classify.constantize.table_name}.created_at >= ?", dripper_action.created_at.change(usec: 0))
 
     if item
-      scoped_recs = scoped_recs.where(id: item.id)
+      final_scope = final_scope.where(id: item.id)
     end
 
+    return final_scope
+
+  end
 
-    scoped_recs.each do |obj|
+  def execute(item = nil)
+
+    dripper_action = Dripper::Action.find_by(action: self.action.to_s, mailer: self.mailer.to_s)
+    scoped_recs(item).each do |obj|
 
       # instantiate the mailer and run the code
       mailer_obj = self.mailer.to_s.classify.constantize

data/lib/tasks/dripper_mail_tasks.rake

@@ -0,0 +1,6 @@
+# desc "Runs dripper for all configured jobs"
+namespace :dripper do
+  task :run => :environment do
+    Dripper.execute
+  end
+end

data/test/dummy/config/initializers/dripper.rb

@@ -0,0 +1,6 @@
+Dripper.config model: :users do
+  dripper mailer: :user_mailer do
+    dripper action: :welcome
+    dripper action: :newsletter, wait: 1.minutes, scope: -> {has_username}
+  end
+end

data/test/dummy/log/development.log

@@ -422,3 +422,20 @@ Migrating to CreateDripperMessages (20160331213900)
             FROM sqlite_temp_master
             WHERE name='index_dripper_messages_on_drippable_type_and_drippable_id' AND type='index'
 
+  Dripper::Action Load (0.1ms)  SELECT  "dripper_actions".* FROM "dripper_actions" WHERE "dripper_actions"."action" = ? AND "dripper_actions"."mailer" = ?  ORDER BY "dripper_actions"."id" ASC LIMIT 1  [["action", "welcome"], ["mailer", "user_mailer"]]
+   (0.0ms)  begin transaction
+  SQL (0.3ms)  INSERT INTO "dripper_actions" ("action", "mailer", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["action", "welcome"], ["mailer", "user_mailer"], ["created_at", "2016-04-08 17:46:40.505133"], ["updated_at", "2016-04-08 17:46:40.505133"]]
+   (0.4ms)  commit transaction
+  Dripper::Action Load (0.1ms)  SELECT  "dripper_actions".* FROM "dripper_actions" WHERE "dripper_actions"."action" = ? AND "dripper_actions"."mailer" = ?  ORDER BY "dripper_actions"."id" ASC LIMIT 1  [["action", "newsletter"], ["mailer", "user_mailer"]]
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "dripper_actions" ("action", "mailer", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["action", "newsletter"], ["mailer", "user_mailer"], ["created_at", "2016-04-08 17:46:40.507200"], ["updated_at", "2016-04-08 17:46:40.507200"]]
+   (0.4ms)  commit transaction
+  Dripper::Action Load (0.2ms)  SELECT  "dripper_actions".* FROM "dripper_actions" WHERE "dripper_actions"."action" = ? AND "dripper_actions"."mailer" = ?  ORDER BY "dripper_actions"."id" ASC LIMIT 1  [["action", "welcome"], ["mailer", "user_mailer"]]
+  Dripper::Action Load (0.0ms)  SELECT  "dripper_actions".* FROM "dripper_actions" WHERE "dripper_actions"."action" = ? AND "dripper_actions"."mailer" = ?  ORDER BY "dripper_actions"."id" ASC LIMIT 1  [["action", "newsletter"], ["mailer", "user_mailer"]]
+  Dripper::Action Load (0.2ms)  SELECT  "dripper_actions".* FROM "dripper_actions" WHERE "dripper_actions"."action" = ? AND "dripper_actions"."mailer" = ?  ORDER BY "dripper_actions"."id" ASC LIMIT 1  [["action", "welcome"], ["mailer", "user_mailer"]]
+  Dripper::Action Load (0.0ms)  SELECT  "dripper_actions".* FROM "dripper_actions" WHERE "dripper_actions"."action" = ? AND "dripper_actions"."mailer" = ?  ORDER BY "dripper_actions"."id" ASC LIMIT 1  [["action", "newsletter"], ["mailer", "user_mailer"]]
+  Dripper::Action Load (0.1ms)  SELECT  "dripper_actions".* FROM "dripper_actions" WHERE "dripper_actions"."action" = ? AND "dripper_actions"."mailer" = ?  ORDER BY "dripper_actions"."id" ASC LIMIT 1  [["action", "welcome"], ["mailer", "user_mailer"]]
+  Dripper::Action Load (0.0ms)  SELECT  "dripper_actions".* FROM "dripper_actions" WHERE "dripper_actions"."action" = ? AND "dripper_actions"."mailer" = ?  ORDER BY "dripper_actions"."id" ASC LIMIT 1  [["action", "newsletter"], ["mailer", "user_mailer"]]
+  Dripper::Action Load (0.3ms)  SELECT  "dripper_actions".* FROM "dripper_actions" WHERE "dripper_actions"."action" = ? AND "dripper_actions"."mailer" = ? LIMIT 1  [["action", "welcome"], ["mailer", "user_mailer"]]
+  Dripper::Action Load (0.0ms)  SELECT  "dripper_actions".* FROM "dripper_actions" WHERE "dripper_actions"."action" = ? AND "dripper_actions"."mailer" = ? LIMIT 1  [["action", "welcome"], ["mailer", "user_mailer"]]
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE ("users"."id" NOT IN (SELECT "dripper_messages"."drippable_id" FROM "dripper_messages" WHERE "dripper_messages"."drippable_type" = ? AND "dripper_messages"."dripper_action_id" = ?)) AND (users.created_at >= '2016-04-08 17:46:40.000000')  [["drippable_type", "User"], ["dripper_action_id", 1]]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dripper_mail
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.16
 platform: ruby
 authors:
 - Douglas Tarr
@@ -62,7 +62,7 @@ files:
 - lib/dripper/engine.rb
 - lib/dripper/version.rb
 - lib/dripper_mail.rb
-- lib/tasks/dripper_tasks.rake
+- lib/tasks/dripper_mail_tasks.rake
 - test/dripper_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
@@ -102,6 +102,7 @@ files:
 - test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/dripper.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
@@ -188,6 +189,7 @@ test_files:
 - test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/dripper.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb

data/lib/tasks/dripper_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :dripper do
-#   # Task goes here
-# end