rssly 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25eaa53235e3ff7b4810a2d4a6b4dd900f5610ad
-  data.tar.gz: 38602296454922cea9ff3d0ec88a5b840a626762
+  metadata.gz: 40b604e802d282cf7b48e9efaad73aa6d68787fd
+  data.tar.gz: 80610e76b8abd289d264974c4585fe83eb0bdfb2
 SHA512:
-  metadata.gz: a99bc70e2a15a275fd315d1553c1c82e880d3583ab646c922c69a2f90d756549b2706fed9d2ccc521db296941485bdac2c00ab90b7a0918e1cc3c84cb835fab9
-  data.tar.gz: 5a95cd19d6b3cf6a7e6eabee10ebfbc29b6b94fd45fe587888c68ff93165f0976a80f8d8ee1f0a2164ba2d8c4e12ebd69efa4a9dc0b51b82b1353b6b0a1bff0b
+  metadata.gz: 0612dc50a7f4040db82c31a147358fa263ab1b50b28fde3461e9df323f4e300855a3b4e41cbda5d3fdc4942c564913841bb1744ff9c479f15809c028593a3cdc
+  data.tar.gz: 4e7c5c5b9bbce27abbd7aad695607ffc1fdadcc0111b5c62d92c2e66df6322e7114523e7a0fa0373d8d1b5da4d7ed88d1d9b4091fc62f53f631577f202815e44

data/lib/rssly/feed.rb

@@ -1,5 +1,6 @@
 require 'feedjira'
 require 'feedbag'
+require 'rfeedfinder'
 
 module Rssly
   # Represents a single rss feed and it's metadata
@@ -8,12 +9,10 @@ module Rssly
     end
 
     attr_accessor :url
-    attr_accessor :title
     attr_accessor :articles
 
-    def initialize(title: nil, url: nil)
+    def initialize(url: nil)
       self.url = url
-      self.title = title
     end
 
     def articles
@@ -23,16 +22,19 @@ module Rssly
     private
 
     def fetch_articles
-      urls = [@url]
-      urls = Feedbag.find(@url) if Rssly::CONFIG[:discover_feeds]
-      result = Feedjira::Feed.fetch_and_parse(*urls)
-      self.title = result.title
-      result.entries.map do |obj|
-        Article.create_from_feedjira_entry(obj)
+      urls = if Rssly::CONFIG[:discover_feeds]
+               ([@url] + Feedbag.find(@url) + Rfeedfinder.feeds(@url))
+                .flatten.uniq.compact
+              else [@url]
+              end
+
+      Feedjira::Feed.fetch_and_parse(urls).values.select do |result|
+        result.class.name.start_with?('Feedjira::')
+      end.reduce([]) do |a, result|
+        a + result.entries.map { |o| Article.create_from_feedjira_entry(o) }
       end
     rescue RuntimeError
-      raise Rssly::HTTPError,
-            "Could not fetch articles for feed: #{url}"
+      raise Rssly::HTTPError, "Could not fetch articles for feed: #{url}"
     end
   end
 end

data/lib/rssly/version.rb

@@ -1,3 +1,3 @@
 module Rssly
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/rssly.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "feedbag", "~> 0.9"
+  spec.add_dependency "rfeedfinder", "~> 0.9"
   spec.add_dependency "feedjira", "~> 1.1"
   spec.add_dependency "ruby-readability", "~> 0.6"
   spec.add_dependency "sanitize", "~> 2.1"

data/spec/collection_spec.rb

@@ -4,7 +4,7 @@ require 'active_support/core_ext'
 
 describe 'Rssly::Collection' do
 
-  COLLECTION_TEST_URL = 'news.ycombinator.com/rss'
+  COLLECTION_TEST_URL = 'https://news.ycombinator.com/rss'
   COLLECTION_ARTICLE_TEST_URL = \
     'http://blog.ycombinator.com/meet-the-people-taking-over-hacker-news'
 

data/spec/feed_spec.rb

@@ -3,9 +3,10 @@ require 'rssly'
 
 describe 'Rssly::Feed' do
 
-  FEED_TEST_URL = 'news.ycombinator.com/rss'
+  FEED_TEST_URL = 'https://news.ycombinator.com/'
 
   before do
+    Rssly::CONFIG[:discover_feeds] = true
     @feed = Rssly::Feed.new(url: FEED_TEST_URL)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rssly
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nathan Kot
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rfeedfinder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: feedjira
   requirement: !ruby/object:Gem::Requirement