rssendy 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4279fe8795a2b0eed13011b09f0db4a4fc8ef2b2
-  data.tar.gz: 8d6635ebb524ea491eff6ef6826ddc2c928e2dd0
+  metadata.gz: 2feac2b5ec0601ea52e8481f00f3355594018bc5
+  data.tar.gz: 1d3f5022dc0b41ba46754288d329ab97b6009745
 SHA512:
-  metadata.gz: 9cb39eef61139aecf4d70e0b60facdb3a62e9289429b46103ea3f27c30590b3eadf20357a40266ef02951d1043626d89b736aeab725c4776a1b6ab06233cff33
-  data.tar.gz: f44bac0b1d320bb2a4d1ced454658f7d473b8275afd6aee00d77789791ba8388172146a0f7872039d685ca4ced542565a7d24c3aab70f1d5f878438d6f4de022
+  metadata.gz: 35be4485db70650686dba33e206937a08e8b9ae36041a43f07d374f9f65fb33da3f5a29b34fd4402418b8c60a92de5e0ff2992c676ba52fba21f81abc517391c
+  data.tar.gz: 71f368a5dd5a3cf467c8c0a953bb2fc30f644968e81280f8a874fce9b361482b356e5bcd6e7d144fe9fde82823a2af635f59327ee4573c582134042eaf11db09

data/lib/rssendy/version.rb

@@ -1,3 +1,3 @@
 module RSSendy
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/rssendy.rb

@@ -29,7 +29,7 @@ module RSSendy
   class Feed
     PROPERTIES = %i{
       api_key url template host from_name from_email reply_to
-      subject plain_text html_text list_ids brand_id send_campaign
+      plain_text html_text list_ids brand_id send_campaign rss_subject
     }
     REQUIREMENTS = %i(api_key content url template host from_name from_email reply_to subject)
 
@@ -49,17 +49,25 @@ module RSSendy
         return @__cont_blk__ unless cont
         @__cont_blk__ = ->(doc) {doc.instance_eval(cont.sub(/^doc\./, ''))}
       end
+
+      def subject(subj=nil)
+        return @__subject__ unless subj
+        @__subject__ = subj
+      end
     end
 
     def initialize(opts={})
       PROPERTIES.each do |property|
         send("#{property}=", opts[property] || self.class.send(property))
       end
+      @subject = opts.fetch(:subject, self.class.subject)
       @content = opts.fetch(:content, self.class.content)
+      @rss_subject = !!rss_subject
     end
 
     attr_accessor(*PROPERTIES)
     attr_reader :response, :doc, :items, :html_template
+    attr_writer :subject
 
     def content
       return @content if Proc === @content || @content.nil?
@@ -67,6 +75,14 @@ module RSSendy
       @content = ->(doc) { doc.instance_eval(_cont.sub(/^doc\./, '')) }
     end
 
+    def subject
+      return @subject unless rss_subject? && !(Proc === @subject)
+      return unless @subject
+
+      _subj = @subject.dup
+      @subject = ->(doc) { doc.instance_eval(_subj.sub(/^doc\./, '')) }
+    end
+
     def pull!
       raise InvalidFeedError, "Feed invalid. Missing keys: #{missing_keys.inspect}" unless valid?
 
@@ -99,12 +115,16 @@ module RSSendy
 
     private
 
+    def rss_subject?
+      rss_subject
+    end
+
     def build_opts
       {
         from_name: from_name,
         from_email: from_email,
         reply_to: reply_to,
-        subject: subject,
+        subject: rss_subject? ? parse_subject : subject,
         html_text: build_template
       }.tap {|opts|
         %i(plain_text list_ids brand_id send_campaign).each do |property|
@@ -113,6 +133,10 @@ module RSSendy
         end
       }
     end
+
+    def parse_subject
+      doc.instance_eval(subject)
+    end
   end
 end
 

data/spec/rssendy_spec.rb

@@ -19,6 +19,9 @@ RSpec.describe RSSendy::Feed do
     <<-RSS
 <rss xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0">
   <channel>
+    <title>
+      why, hello thar
+    </title>
     <item>
       <content:encoded>
         <![CDATA[
@@ -72,6 +75,24 @@ RSpec.describe RSSendy::Feed do
   describe 'instance' do
     let(:feed) { subject.new }
 
+    describe "setting subject" do
+      context "when rss_subject false" do
+        it "has subject set manually" do
+          expect(feed.subject).to eql("latest news")
+        end
+      end
+
+      context "when rss_subject true" do
+        before do
+          feed.subject = 'doc.at_xpath("//title").text.strip'
+          feed.rss_subject = true
+        end
+
+        it "pulls subject from feed" do
+          expect(feed.subject[doc]).to eql("why, hello thar")
+        end
+      end
+    end
     describe '#build_template' do
       context "when valid" do
         before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rssendy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - jonah honeyman