RubyGems - caffeinate - Versions diffs - 0.7.0 → 0.8.4 - Mend

caffeinate 0.7.0 → 0.8.4

Files changed (12) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93135cbbdb419e6d7eccd587c9b10447c3c7247cc425ff86057a328b27761baa
-  data.tar.gz: 5b7993dff3ccb1e3e468438c5b50f73f525d2a03418e0ceaaa03f751c097f010
+  metadata.gz: 3a1b112ae3aa4c5c0d6f5d0754dffe6fc720c025739d3b78487b78754b4bd8fb
+  data.tar.gz: a7ede18dbf114ebf23c3c6eba347b60524963574a921687ffba1943885055777
 SHA512:
-  metadata.gz: 504b0123a7628ff97fda131c0ddb55ccc76d1ddc63b9a75afb799170ad3e10bbdc4598860848045eb6ac5976a44575bbb0287bf0bcb33744c29e12c551feb8e0
-  data.tar.gz: 48f9293fdbe4f34ed6a0d46bdfce4278783a8e49fde0c740a5f988572790570209e6e06db559bdfc7acaf0a15ab00718af14e8e43d69d30332b9a8a578d3410b
+  metadata.gz: 83efe161d7aa1885ebd1080b1fe640ea87e21b9dd1dbf494998b361a4ae6f1188a23a4aa509766edec90eabea2fbc9b08d6f8b305592cbaeeaf38343737e16ef
+  data.tar.gz: 4c42564577a0321ad57cf7a052645a2ea3fe2670e701789dfb123a1801e95a98dc3754602d318b9d341921b1f41c47cc03d8bfd1a678d4ef3e3b0317d32e29c6

@@ -35,10 +35,8 @@ module Caffeinate
     end
     # Checks to see if the subscriber exists.
-    #
-    # Use `find_by` so that we don't have to load the record twice. Often used with `subscribes?`
     def subscriber(record, **args)
-      @subscriber ||= caffeinate_campaign_subscriptions.find_by(subscriber: record, **args)
+      caffeinate_campaign_subscriptions.find_by(subscriber: record, **args)
     end
     # Check if the subscriber exists
@@ -58,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!(**args)
+      mailing.caffeinate_campaign_subscription.end!(**args)
       false
     end
     # Unsubscribes the CampaignSubscription
-    def unsubscribe!
-      mailing.caffeinate_campaign_subscription.unsubscribe!
+    def unsubscribe!(**args)
+      mailing.caffeinate_campaign_subscription.unsubscribe!(**args)
       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.0'
+  VERSION = '0.8.4'
 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.0
+  version: 0.8.4
 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