caffeinate 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 855b98e11499fe2a9fbf1e589530d60d511363e55ea80cdf1b4322dc92af1f3c
-  data.tar.gz: ca000ad1c32cb053901e3f69dcc370725044c3529c673839c3f4ef9b43dc5505
+  metadata.gz: 3a1b112ae3aa4c5c0d6f5d0754dffe6fc720c025739d3b78487b78754b4bd8fb
+  data.tar.gz: a7ede18dbf114ebf23c3c6eba347b60524963574a921687ffba1943885055777
 SHA512:
-  metadata.gz: 1d8e13de2b19eb8d7a628ae2e5ca9e0bca0d985f36629994257775a2d3b7b5b0641584fc349929ac6930e65fd6a4958556dbd0ab3604600a37c5879858657720
-  data.tar.gz: 999a9e763d4e1b7f96a5549f61eca6c0c1e2029e346dadea08281eb00c754ed2ccd1022dcdcbf13b315572446bf1eb5d699dde802604cc441f897cdac5fe5256
+  metadata.gz: 83efe161d7aa1885ebd1080b1fe640ea87e21b9dd1dbf494998b361a4ae6f1188a23a4aa509766edec90eabea2fbc9b08d6f8b305592cbaeeaf38343737e16ef
+  data.tar.gz: 4c42564577a0321ad57cf7a052645a2ea3fe2670e701789dfb123a1801e95a98dc3754602d318b9d341921b1f41c47cc03d8bfd1a678d4ef3e3b0317d32e29c6

data/app/models/caffeinate/campaign.rb

@@ -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

data/lib/caffeinate/drip_evaluator.rb

@@ -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
 

data/lib/caffeinate/dripper/perform.rb

@@ -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)

data/lib/caffeinate/version.rb

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

data/lib/generators/caffeinate/views_generator.rb

@@ -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

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caffeinate
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.4
 platform: ruby
 authors:
 - Josh Brody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-17 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