RubyGems - caffeinate - Versions diffs - 0.7.1 → 0.8.5 - Mend

caffeinate 0.7.1 → 0.8.5

Files changed (12) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebd5c45c4d4fd056ba4ff2080a464e2151bc3245849c709d9f81d396c4b36523
-  data.tar.gz: 0ed91aa4d77c8b368fadc721ffdd81bdd70a249cebe077fadcd2161b6ebf6dab
+  metadata.gz: 5f2ea2b9f5f03fdeb85614ae404df166822797d18861bd1c6ea5c4c867f44618
+  data.tar.gz: 38b8cd78227cc1eecffe4e09ee01fd8e26a7fc46314d30956ce29230b1209f7f
 SHA512:
-  metadata.gz: 0dc2f09d245f8936bf55ab0c00d8a4cd4b8651db10f9656a66869088297c43c694b1c71356421216d59a27376fac89962bb8dbd02dfd7d648e65578f2cfb1900
-  data.tar.gz: 3554585afc00fc341c8627ee67071c02ca8f60092f96545043c4c06447a4c6c0ae37e3292cda9293047670471c7b16843dfa3a5b04b4b215ea93562d7050d22b
+  metadata.gz: 3fd342f50ad5394c5253d1c7c00efa7ce25e1d1f90571fe16658bed9f0d251893f4953d746daf4db48728541d13fc67ee505529aae18711e491ca0819f66d6a1
+  data.tar.gz: 8ec91a5b080a1420f090a4c538c1fd1cd05def80c5aa5395ce2a2d985063e4ef7d26e935ec1131496525d44bd745abbac90cbbc749e9ec6b55d1c0f3a99d8e49

@@ -56,7 +56,7 @@ module Caffeinate
     def unsubscribe(subscriber, **args)
       reason = args.delete(:reason)
       subscription = subscriber(subscriber, **args)
-      raise ActiveRecord::RecordInvalid, subscription if subscription.nil?
+      raise ::ActiveRecord::RecordInvalid, subscription if subscription.nil?
       subscription.unsubscribe!(reason)
     end

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title><%= Rails.application.class.module_parent_name %></title>
+  <title></title>
 </head>
 <body>

data/lib/caffeinate.rb CHANGED

@@ -1,6 +1,16 @@
 # frozen_string_literal: true
-require 'rails/all'
+require 'active_support'
+%w(
+  active_record/railtie
+  action_controller/railtie
+  action_view/railtie
+  action_mailer/railtie
+).each do |railtie|
+  require railtie
+end
 require 'caffeinate/mail_ext'
 require 'caffeinate/engine'
 require 'caffeinate/drip'

data/lib/caffeinate/drip.rb CHANGED

@@ -25,6 +25,8 @@ module Caffeinate
         start = mailing.instance_exec(&options[:start])
         start += options[:every] if mailing.caffeinate_campaign_subscription.caffeinate_mailings.count.positive?
         date = start.from_now
+      elsif options[:on]
+        date = mailing.instance_exec(&options[:on])
       else
         date = options[:delay].from_now
       end

@@ -16,14 +16,14 @@ module Caffeinate
     end
     # Ends the CampaignSubscription
-    def end!
-      mailing.caffeinate_campaign_subscription.end!
+    def end!(msg)
+      mailing.caffeinate_campaign_subscription.end!(msg)
       false
     end
     # Unsubscribes the CampaignSubscription
-    def unsubscribe!
-      mailing.caffeinate_campaign_subscription.unsubscribe!
+    def unsubscribe!(msg)
+      mailing.caffeinate_campaign_subscription.unsubscribe!(msg)
       false
     end

@@ -42,7 +42,7 @@ module Caffeinate
       def validate_drip_options(action, options)
         options.symbolize_keys!
-        options.assert_valid_keys(:mailer_class, :step, :delay, :every, :start, :using, :mailer, :at)
+        options.assert_valid_keys(:mailer_class, :step, :delay, :every, :start, :using, :mailer, :at, :on)
         options[:mailer_class] ||= options[:mailer] || @dripper.defaults[:mailer_class]
         options[:using] ||= @dripper.defaults[:using]
         options[:step] ||= @dripper.drips.size + 1
@@ -51,8 +51,8 @@ module Caffeinate
           raise ArgumentError, "You must define :mailer_class or :mailer in the options for #{action.inspect} on #{@dripper.inspect}"
         end
-        if options[:every].nil? && options[:delay].nil?
-          raise ArgumentError, "You must define :delay in the options for #{action.inspect} on #{@dripper.inspect}"
+        if options[:every].nil? && options[:delay].nil? && options[:on].nil?
+          raise ArgumentError, "You must define :delay or :on or :every in the options for #{action.inspect} on #{@dripper.inspect}"
         end
         options

@@ -20,7 +20,7 @@ module Caffeinate
           .upcoming
           .unsent
           .joins(:caffeinate_campaign_subscription)
-          .merge(Caffeinate::CampaignSubscription.active)
+          .merge(Caffeinate::CampaignSubscription.active.where(caffeinate_campaign: self.campaign))
           .in_batches(of: self.class.batch_size)
           .each do |batch|
           run_callbacks(:on_perform, self, batch)

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 module Mail
+  def self.from_source(source)
+    Mail.new Mail::Utilities.binary_unsafe_to_crlf(source.to_s)
+  end
   # Extend Mail::Message to account for a Caffeinate::Mailing
   class Message
     attr_accessor :caffeinate_mailing

data/lib/caffeinate/version.rb CHANGED

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Caffeinate
-  VERSION = '0.7.1'
+  VERSION = '0.8.5'
 end

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+require 'rails/generators/base'
+module Caffeinate
+  module Generators
+    module ViewPathTemplates #:nodoc:
+      extend ActiveSupport::Concern
+      included do
+        public_task :copy_views
+      end
+      def copy_views
+        view_directory :campaign_subscriptions
+      end
+      protected
+      def view_directory(name, _target_path = nil)
+        directory name.to_s, _target_path || "#{target_path}/#{name}" do |content|
+          content
+        end
+      end
+      def target_path
+        @target_path ||= "app/views/caffeinate"
+      end
+    end
+    class SharedViewsGenerator < Rails::Generators::Base #:nodoc:
+      include ViewPathTemplates
+      source_root File.expand_path("../../../../app/views/caffeinate", __FILE__)
+      desc "Copies shared Caffeinate views to your application."
+      hide!
+    end
+    class ViewsGenerator < Rails::Generators::Base
+      desc "Copies Caffeinate views to your application."
+      invoke SharedViewsGenerator
+    end
+  end
+end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caffeinate
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.5
 platform: ruby
 authors:
 - Josh Brody
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -177,6 +177,7 @@ files:
 - lib/generators/caffeinate/install_generator.rb
 - lib/generators/caffeinate/templates/application_dripper.rb
 - lib/generators/caffeinate/templates/caffeinate.rb
+- lib/generators/caffeinate/views_generator.rb
 homepage: https://github.com/joshmn/caffeinate
 licenses:
 - MIT