feed2email 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e90ae1ad818a1966844926f7653f068a284a13d3
-  data.tar.gz: 1f6ed9ac284fc677ca57d89cbcbf6a29543a1a19
+  metadata.gz: e69b799d3cbd8ab553fedc851e4439103379867e
+  data.tar.gz: ec73447b756ec375b735a827c9a843de960829ac
 SHA512:
-  metadata.gz: 7654f7a35ae49c97c79e39b4141d0e2ef52aa952db6c953a4d31550ea50606937ff3c862b94617e1132e64fd42c82ab84dadceb7dfbadc43e6b5a852acdb44e9
-  data.tar.gz: 685064935abc8fbe1a6ec02be6fb2223dfdf7d8ed192cc1262839650f1f61538e6f760c90bb368f298fdb0127e5e9c895dcb08c01bd539993b5ccc703daa0a1e
+  metadata.gz: 58ff89046e9cd04c210e9467ff31ccc176dffbe12a537a48d15bd21d857527ce70c55fd4be162fc4bf061942c7b91e54e0944b44baf52c080d273cd0b0f95cd6
+  data.tar.gz: 4c83c6c595369c8a50ff535b18cd00a6b36387c26c4f3b0ccd1620097d57301db68438926e362a772d25629641c06a0f26efd13e13a73c56dbbedd891c92662c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.9.1
+
+* Fix feed type detection for secure feed URLs in OPML export
+
 ### 0.9.0
 
 * Change data backend from YAML to SQLite3

data/lib/feed2email.rb

@@ -11,6 +11,10 @@ module Feed2Email
     root.join('config.yml').to_s
   end
 
+  def self.database_path
+    root.join('feed2email.db').to_s
+  end
+
   def self.logger
     @logger ||= Logger.new(
       config['log_path'], config['log_level'], config['log_shift_age'],

data/lib/feed2email/database.rb

@@ -2,40 +2,20 @@ require 'sequel'
 require 'feed2email'
 
 module Feed2Email
-  def self.database
-    @database
-  end
-
-  def self.database=(database)
-    @database = database
-  end
-
-  def self.database_path
-    root.join('feed2email.db').to_s
-  end
-
   class Database
     def self.setup
-      return if Feed2Email.database
-
-      Feed2Email.database = new(
-        adapter:       'sqlite',
-        database:      Feed2Email.database_path,
-        loggers:       [Feed2Email.logger],
+      new(
+        adapter: 'sqlite',
+        database: Feed2Email.database_path,
+        loggers: [Feed2Email.logger],
         sql_log_level: :debug
       )
-      Feed2Email.database.setup
     end
 
     def initialize(connect_options)
       @connect_options = connect_options
-    end
-
-    def setup
-      unless connection
-        setup_connection
-        setup_schema
-      end
+      setup_connection
+      setup_schema
     end
 
     private
@@ -44,8 +24,6 @@ module Feed2Email
 
     def connection; @connection end
 
-    def path; connect_options[:database] end
-
     def setup_connection
       @connection = Sequel::Model.db = Sequel.connect(connect_options)
     end
@@ -71,5 +49,7 @@ module Feed2Email
         Time :updated_at
       end
     end
+
+    setup
   end
 end

data/lib/feed2email/entry.rb

@@ -9,8 +9,6 @@ require 'feed2email/loggable'
 require 'feed2email/version'
 
 module Feed2Email
-  Database.setup
-
   if config['send_method'] == 'smtp'
     require 'feed2email/smtp_connection'
     SMTPConnection.setup

data/lib/feed2email/feed.rb

@@ -14,8 +14,6 @@ require 'feed2email/redirection_checker'
 require 'feed2email/version'
 
 module Feed2Email
-  Database.setup
-
   class Feed < Sequel::Model(:feeds)
     plugin :dirty
     plugin :timestamps

data/lib/feed2email/opml_exporter.rb

@@ -56,11 +56,11 @@ module Feed2Email
 
       loop do
         uri = URI.parse(url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = (uri.scheme == 'https')
 
         begin
-          response = Net::HTTP.start(uri.host, uri.port) {|http|
-            http.head(uri.request_uri)
-          }
+          response = http.head(uri.request_uri)
         rescue
           break
         end

data/lib/feed2email/version.rb

@@ -1,3 +1,3 @@
 module Feed2Email
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feed2email
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Aggelos Orfanakos