feed2email 0.5.0 → 0.6.0

data/lib/feed2email/mail.rb

@@ -1,3 +1,6 @@
+require 'mail'
+require 'net/smtp'
+
 module Feed2Email
   class Mail
     def initialize(entry, feed_title)
@@ -6,8 +9,6 @@ module Feed2Email
     end
 
     def send
-      sleep config['send_delay'] || 10 # avoid Net::SMTPServerBusy errors
-
       if smtp_configured?
         send_with_smtp
       else
@@ -30,15 +31,15 @@ module Feed2Email
         </body>
         </html>
       }.gsub(/^\s+/, '') % {
-        :uri     => @entry.uri.escape_html,
-        :title   => @entry.title.strip_html,
-        :content => @entry.content,
+        content: @entry.content,
+        title:   @entry.title.strip_html,
+        uri:     @entry.uri.escape_html,
       }
     end
 
     def body_text
       %{
-        %{title}
+        # [%{title}](%{uri})
 
         %{content}
 
@@ -47,35 +48,20 @@ module Feed2Email
         --
         Sent by feed2email #{VERSION} at #{Time.now}
       }.gsub(/^\s+/, '') % {
-        :title   => @entry.title.strip_html,
-        :content => @entry.content.strip_html,
-        :uri     => @entry.uri,
+        content: @entry.content.to_markdown,
+        title:   @entry.title.strip_html,
+        uri:     @entry.uri,
       }
     end
 
     def config
-      Feed2Email::Config.instance.config
-    end
-
-    def from_address
-      if config['sender']
-        config['sender']
-      elsif @entry.author && @entry.author['@']
-        @entry.author[/\S+@\S+/]
-      elsif smtp_configured?
-        '%{user}@%{host}' % {
-          :user => config['smtp_user'].gsub(/\W/, '_'),
-          :host => config['smtp_host']
-        }
-      else
-        recipient
-      end
+      Feed2Email.config # delegate
     end
 
     def mail
       ::Mail.new.tap do |m|
-        m.from      = %{"#{@feed_title}" <#{from_address}>}
-        m.to        = recipient
+        m.from      = %{"#{@feed_title}" <#{config['sender']}>}
+        m.to        = config['recipient']
         m.subject   = @entry.title.strip_html
         m.html_part = mail_part('text/html', body_html)
         m.text_part = mail_part('text/plain', body_text)
@@ -89,28 +75,23 @@ module Feed2Email
       part
     end
 
-    def recipient
-      config['recipient']
-    end
-
     def send_with_sendmail
-      open("|#{sendmail_bin} #{recipient}", 'w') do |f|
+      open("|#{config['sendmail_path']} #{config['recipient']}", 'w') do |f|
         f.write(mail)
       end
     end
 
     def send_with_smtp
-      host = config['smtp_host']
-      port = config['smtp_port']
-      user = config['smtp_user']
-      pass = config['smtp_pass']
-      tls  = config['smtp_tls'].nil? ? true : config['smtp_tls'] # default: true
-      auth = (config['smtp_auth'] || 'login').to_sym # default: 'login'
-
-      smtp = Net::SMTP.new(host, port)
-      smtp.enable_starttls if tls
-      smtp.start('localhost', user, pass, auth) do
-        smtp.send_message(mail, from_address, recipient)
+      smtp = Net::SMTP.new(config['smtp_host'], config['smtp_port'])
+      smtp.enable_starttls if config['smtp_tls']
+
+      smtp.start(
+        'localhost',
+        config['smtp_user'],
+        config['smtp_pass'],
+        config['smtp_auth'].to_sym
+      ) do
+        smtp.send_message(mail, config['sender'], config['recipient'])
       end
     end
 
@@ -120,9 +101,5 @@ module Feed2Email
         config['smtp_user'] &&
         config['smtp_pass']
     end
-
-    def sendmail_bin
-      config['sendmail_path'] || '/usr/sbin/sendmail'
-    end
   end
 end

data/lib/feed2email/version.rb

@@ -1,3 +1,3 @@
 module Feed2Email
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/lib/feed2email.rb

@@ -1,17 +1,18 @@
-require 'cgi'
-require 'feedzirra'
-require 'fileutils'
-require 'logger'
-require 'mail'
-require 'net/smtp'
-require 'sanitize'
-require 'singleton'
-require 'yaml'
+module Feed2Email
+  CONFIG_DIR = File.expand_path('~/.feed2email')
+
+  def self.config
+    @config ||= Config.new(File.join(CONFIG_DIR, 'config.yml'))
+  end
+
+  def self.logger
+    @logger ||= Logger.new(config['log_path'], config['log_level'])
+  end
+
+  def self.log(*args)
+    logger.log(*args) # delegate
+  end
+end
 
 require 'feed2email/config'
 require 'feed2email/logger'
-require 'feed2email/version'
-require 'feed2email/core_ext'
-require 'feed2email/mail'
-require 'feed2email/entry'
-require 'feed2email/feed'

metadata

@@ -1,102 +1,202 @@
 --- !ruby/object:Gem::Specification
 name: feed2email
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Aggelos Orfanakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: feedzirra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: reverse_markdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: travis-lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: RSS/Atom feed updates in your email
-email:
-- agorf@agorf.gr
+description: 
+email: me@agorf.gr
 executables:
+- feed2email-migrate-history
 - feed2email
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
+- TODO.md
 - bin/feed2email
-- feed2email.gemspec
+- bin/feed2email-migrate-history
 - lib/feed2email.rb
 - lib/feed2email/config.rb
 - lib/feed2email/core_ext.rb
 - lib/feed2email/entry.rb
 - lib/feed2email/feed.rb
+- lib/feed2email/feed_data_file.rb
+- lib/feed2email/feed_history.rb
+- lib/feed2email/feed_meta.rb
+- lib/feed2email/feeds.rb
 - lib/feed2email/logger.rb
 - lib/feed2email/mail.rb
 - lib/feed2email/version.rb
-homepage: http://github.com/agorf/feed2email
-licenses: []
+homepage: https://github.com/agorf/feed2email
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  WARNING! feed2email now maintains a separate history file per feed!
+
+  Please run the provided migration script `feed2email-migrate-history` before
+  using feed2email. This will split an existing single history file to many small
+  ones, one for each feed.
+
+  If history is not migrated, feed2email will think it is run for the first time
+  and will treat all entries as old (thus no email will be sent and you may miss
+  some entries).
+
+  WARNING! "sender" is now a required config option. Please update your config
+  file by setting it to an email address to send email from.
+
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RSS/Atom feed updates in your email

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-*.yml
-.bundle
-pkg/

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/Gemfile.lock

@@ -1,39 +0,0 @@
-PATH
-  remote: .
-  specs:
-    feed2email (0.4.0)
-      feedzirra
-      mail
-      sanitize
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    curb (0.8.5)
-    feedzirra (0.7.0)
-      curb (~> 0.8.1)
-      loofah (~> 1.2.1)
-      sax-machine (~> 0.2.1)
-    loofah (1.2.1)
-      nokogiri (>= 1.4.4)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    mini_portile (0.5.2)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    polyglot (0.3.3)
-    sanitize (2.1.0)
-      nokogiri (>= 1.4.4)
-    sax-machine (0.2.1)
-      nokogiri (~> 1.6.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  feed2email!

data/Rakefile

@@ -1 +0,0 @@
-require 'bundler/gem_tasks'

data/feed2email.gemspec

@@ -1,27 +0,0 @@
-require 'date'
-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'feed2email/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = 'feed2email'
-  gem.version       = Feed2Email::VERSION
-
-  gem.authors       = ['Aggelos Orfanakos']
-  gem.date          = Date.today
-  gem.email         = ['agorf@agorf.gr']
-  gem.homepage      = 'http://github.com/agorf/feed2email'
-
-  gem.description   = %q{RSS/Atom feed updates in your email}
-  gem.summary       = gem.description
-
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map {|f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ['lib']
-
-  gem.add_dependency 'feedzirra'
-  gem.add_dependency 'mail'
-  gem.add_dependency 'sanitize'
-end