correole 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8f2fe3a7de80d7791152fd8a3763666393e9126af594aa3f67b4cba3e468342
-  data.tar.gz: beb208a8c5f5798cd60f8ace8a62b7b949f1c363a2c85e8e2bc85267fb22de6d
+  metadata.gz: c383918b800ea3b2cbe74401782d07e462762a89659e917275c938234e4e3aa4
+  data.tar.gz: 50497adea72cd5b913eb02e748a8cf521c49d5540ef65ace4efba4da67409cde
 SHA512:
-  metadata.gz: c3b3d63f74a0be04f81a0ccee3cb48d467f3920701e6cc3cd0bf8a1e516effc8a0c8cecb3c3725e8e0d410d987811a38267dd26702abf06d2d412311a6deddb2
-  data.tar.gz: 32bdbf7124e7aed3474111af567c7cb8b1390d92807764285af43efe19be0c562c2dc8079667edaf07a7a3dd2857a1559ecbd5276dbb52a1d5b0086957604691
+  metadata.gz: 8873b9c5abb6dfe2806f1ee2509d6633fb3a07c771c5df39ff78e6839ee2454ac7037a49a8d58b4ff7ca8f94d1339bf68dd150f409b0b7636e6896fddb65c645
+  data.tar.gz: '07618872e9306c83cb78ae5a12452f18f8f623cb28b1340b0367b2c1fbaed46207bc9d29d6021c7c9dd7956ffdb25f8d329073bec28e38471288e5e45cb329fd'

data/bin/correole

@@ -15,8 +15,8 @@ when 'send'
 when 'test'
   Configuration.dry_run = true
   Send.run!
-when 'purge'
-  Purge.run!
+when 'skip'
+  Skip.run!
 else
   abort "Unknown parameters #{ARGV}."
 end

data/config/config.yml

@@ -0,0 +1,40 @@
+test:
+  quiet: true
+  dry_run: false
+  dry_run_email: test@mail.com
+  base_uri: http://test.ruslanledesma.com
+  feed: http://ruslanledesma.com/feed.xml # reset by env for end-to-end test
+  unsubscribe_uri: 'http://newsletter.ruslanledesma.com/unsubscribe/?email=<%= recipient %>'
+  confirmation_uri: http://newsletter.ruslanledesma.com/unsubscribed/
+  subject: 'Test <%= title %> - <%= date %>'
+  from: '<%= title %> <no-reply@ruslanledesma.com>'
+  html_template: templates/test.html.erb
+  plain_template: templates/test.txt.erb
+  smtp_host: localhost # reset by env for end-to-end test
+  smtp_port: 25 # reset by env for end-to-end test
+  smtp_user:
+  smtp_pass:
+  smtp_auth:
+  smtp_ttls: false
+
+development: &dev
+  quiet: false
+  dry_run: false
+  dry_run_email: your.email@mail.com
+  base_uri: http://newsletter.ruslanledesma.com
+  feed: http://ruslanledesma.com/feed.xml
+  unsubscribe_uri: 'http://ruslanledesma.com/unsubscribe/?email=<%= recipient %>'
+  confirmation_uri: http://ruslanledesma.com/unsubscribed/
+  subject: '<%= title %>: newsletter for <%= date %>'
+  from: '<%= title %> <no-reply@ruslanledesma.com>'
+  html_template: templates/production.html.erb
+  plain_template: templates/production.txt.erb
+  smtp_host:
+  smtp_port:
+  smtp_user:
+  smtp_pass:
+  smtp_auth:
+  smtp_ttls:
+
+production:
+  <<: *dev

data/config/configuration.rb

@@ -46,8 +46,8 @@ class Configuration
         # Cannot store boolean values in ENV, thus this.
         self.send("#{k.downcase}=".to_sym, ENV[k] == 'true')
       when 'HTML_TEMPLATE', 'PLAIN_TEMPLATE'
-        file = File.expand_path "../#{ENV[k]}", __FILE__
-        template = File.read file rescue abort "Cannot load template #{ENV[k]}."
+        path = File.expand_path "../#{ENV[k]}", __FILE__
+        template = File.read path rescue abort "Cannot load template #{path}."
         self.send("#{k.downcase}=".to_sym, template)
       when 'SMTP_USER', 'SMTP_PASS'
         # For user name and password, Mail interprets '' as an input.

data/config/dependencies.rb

@@ -7,7 +7,7 @@ require 'correole/item'
 require 'correole/feed'
 require 'correole/api'
 require 'correole/send'
-require 'correole/purge'
+require 'correole/skip'
 require 'net/http'
 require 'mail'
 require 'configuration'

data/db/migrate/0001_create_database.rb

@@ -1,4 +1,4 @@
-class CreateDatabase < ActiveRecord::Migration
+class CreateDatabase < ActiveRecord::Migration[6.0]
   def change
     create_table :subscribers do |t|
       t.string :email, null: false

data/db/migrate/0002_create_items.rb

@@ -1,4 +1,4 @@
-class CreateItems < ActiveRecord::Migration
+class CreateItems < ActiveRecord::Migration[6.0]
   def change
     create_table :items do |t|
       t.string :title, null: false

data/lib/correole/api.rb

@@ -9,12 +9,15 @@ class Api < Sinatra::Base
   set :server, :thin
   enable :logging
   disable :show_exceptions
-#  use ActiveRecord::ConnectionAdapters::ConnectionManagement
 
   before do
     content_type 'text/plain'
   end
 
+  after do
+     ActiveRecord::Base.clear_active_connections!
+  end
+
   def subscribe(params)
     response.headers['Access-Control-Allow-Origin'] = SUBSCRIBERS_ALLOWED_ORIGIN
     s = Subscriber.new(email: params[:email])

data/lib/correole/feed.rb

@@ -33,5 +33,4 @@ class Feed
     return split_feed
   end
 
-
 end

data/lib/correole/{purge.rb → skip.rb}

@@ -1,4 +1,4 @@
-class Purge
+class Skip
 
   def self.run!
     qputs "Fetch feed from #{Configuration.feed}."
@@ -10,7 +10,7 @@ class Purge
     end
     qputs "There are #{unsent_items.length} new items. The items are the following."
     unsent_items.each_with_index { |i, j| qputs "[#{j+1}] #{i.link}" }
-    qputs 'Purge the new items by remembering them.'
+    qputs 'Skip the new items by remembering them.'
     unsent_items.each { |i| i.save }
     qputs 'Done.'
   end

data/lib/correole/version.rb

@@ -1,4 +1,4 @@
 module Correole
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
   DATE = '2020-07-19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: correole
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ruslan Ledesma Garza
@@ -202,23 +202,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/correole
+- config/config.yml
 - config/configuration.rb
 - config/database.yml
 - config/dependencies.rb
-- config/example.config.yml
-- config/production.html.erb
-- config/production.txt.erb
-- config/test.config.yml
-- config/test.html.erb
-- config/test.txt.erb
+- config/templates/production.html.erb
+- config/templates/production.txt.erb
+- config/templates/test.html.erb
+- config/templates/test.txt.erb
 - db/migrate/0001_create_database.rb
 - db/migrate/0002_create_items.rb
 - lib/correole/api.rb
 - lib/correole/feed.rb
 - lib/correole/item.rb
-- lib/correole/purge.rb
 - lib/correole/qputs.rb
 - lib/correole/send.rb
+- lib/correole/skip.rb
 - lib/correole/subscriber.rb
 - lib/correole/version.rb
 homepage: http://ruslanledesma.com/

data/config/example.config.yml

@@ -1,21 +0,0 @@
-production: &prod
-  quiet: false
-  dry_run: false
-  dry_run_email: your.email@mail.com
-  base_uri: http://newsletter.ruslanledesma.com
-  feed: http://ruslanledesma.com/feed.xml
-  unsubscribe_uri: 'http://ruslanledesma.com/unsubscribe/?email=<%= recipient %>'
-  confirmation_uri: http://ruslanledesma.com/unsubscribed/
-  subject: '<%= title %>: newsletter for <%= date %>'
-  from: '<%= title %> <no-reply@ruslanledesma.com>'
-  html_template: production.html.erb
-  plain_template: production.txt.erb
-  smtp_host:
-  smtp_port:
-  smtp_user:
-  smtp_pass:
-  smtp_auth:
-  smtp_ttls:
-
-development:
-  <<: *prod

data/config/test.config.yml

@@ -1,18 +0,0 @@
-test:
-  quiet: true
-  dry_run: false
-  dry_run_email: test@mail.com
-  base_uri: http://test.ruslanledesma.com
-  feed: http://ruslanledesma.com/feed.xml # reset by env for end-to-end test
-  unsubscribe_uri: 'http://newsletter.ruslanledesma.com/unsubscribe/?email=<%= recipient %>'
-  confirmation_uri: http://newsletter.ruslanledesma.com/unsubscribed/
-  subject: 'Test <%= title %> - <%= date %>'
-  from: '<%= title %> <no-reply@ruslanledesma.com>'
-  html_template: test.html.erb
-  plain_template: test.txt.erb
-  smtp_host: localhost # reset by env for end-to-end test
-  smtp_port: 25 # reset by env for end-to-end test
-  smtp_user:
-  smtp_pass:
-  smtp_auth:
-  smtp_ttls: false