feedbag 0.9.6 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9698260f809a5f86915b8dbd281555903884fd4e
-  data.tar.gz: 62d1b97a453ca8df4583159b68202c6abe62a473
+  metadata.gz: d849beafed42f6eaf06f5847d525b284990ea308
+  data.tar.gz: 59de9e7d7692ef586d82812bec5086b7570e75e1
 SHA512:
-  metadata.gz: c23b21e4885ce88fe32748f289afd5ae3b8ca03170399cb1958f5ae2627519424a3a9a9f6492d93492f3ff718932b745a815bd6647059d83b720f7496dcd1306
-  data.tar.gz: e01f337445faaf3a624e74c2d9c4fc7cb39fccf0e9aadf29c068e9e0942c7b4b84b732dda22cb268642e59ccb741e4c0cf5e4e482d701fc1f72d91f0f7ef400b
+  metadata.gz: 9a3d98e90e7f48bcbb44a461ff35f674737b2c4d93c09f137e33b3afdba4fdfb69221681ae43778aa39c7724d5305ca12ae38f258d83ff08294d1799d8374819
+  data.tar.gz: 367c78e9308d3e8ec85d3576c41d4f56057bc42766c5660d7adbdf7e6b52ccf3e4bd6062216b3031c240655168e557f37e55042584d2607d64ed530c84e90a17

data/README.markdown

@@ -33,11 +33,11 @@ You can also use the command line tool for quick queries, if you install the gem
 - Because it only uses [Nokogiri](http://nokogiri.org/) as dependency.
 - Because it follows modern feed filename conventions (like those ones used by WordPress blogs, or Blogger, etc).
 - Because it's a single file you can embed easily in your application.
-- Because it's faster than rfeedfinder.
+- Because it's faster than anything else.
 
 ### Author
 
-[David Moreno](http://damog.net/) <[david@axiombox.com](mailto:david@axiombox.com)>.
+[David Moreno](http://damog.net/) <[damog@damog.net](mailto:damog@damog.net)>.
 
 ### Donations
 
@@ -47,4 +47,4 @@ You can also use the command line tool for quick queries, if you install the gem
 
 ### Copyright
 
-This is free software. See [COPYING](https://raw.githubusercontent.com/damog/feedbag/master/COPYING) for more information.
+This is and will always be free software. See [COPYING](https://raw.githubusercontent.com/damog/feedbag/master/COPYING) for more information.

data/lib/feedbag.rb

@@ -9,10 +9,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -36,6 +36,7 @@ class Feedbag
     'text/xml',
     'application/rss+xml',
     'application/rdf+xml',
+    'application/json',   
   ].freeze
 
   def self.feed?(url)
@@ -115,19 +116,22 @@ class Feedbag
 
         # first with links
         (doc/"atom:link").each do |l|
-          next unless l["rel"]
+          next unless l["rel"] && l["href"].present?
           if l["type"] and CONTENT_TYPES.include?(l["type"].downcase.strip) and l["rel"].downcase == "self"
             self.add_feed(l["href"], url, @base_uri)
           end
         end
 
-        (doc/"link").each do |l|
-          next unless l["rel"]
-          if l["type"] and CONTENT_TYPES.include?(l["type"].downcase.strip) and (l["rel"].downcase =~ /alternate/i or l["rel"] == "service.feed")
+        doc.xpath("//link[@rel='alternate' or @rel='service.feed'][@href][@type]").each do |l|
+          if CONTENT_TYPES.include?(l['type'].downcase.strip)
             self.add_feed(l["href"], url, @base_uri)
           end
         end
 
+        doc.xpath("//link[@rel='alternate' and @type='application/json'][@href]").each do |e| 
+          self.add_feed(e['href'], url, @base_uri) if self.looks_like_feed?(e['href'])
+        end
+
         (doc/"a").each do |a|
           next unless a["href"]
           if self.looks_like_feed?(a["href"]) and (a["href"] =~ /\// or a["href"] =~ /#{url_uri.host}/)

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedbag
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8
 platform: ruby
 authors:
 - David Moreno
-- Derek Willis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2017-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -45,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -73,8 +72,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Ruby's favorite feed auto-discovery tool
-email: david@axiombox.com
+email: damog@damog.net
 executables:
 - feedbag
 extensions: []
@@ -109,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: feedbag
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby's favorite feed auto-discovery tool