feedcellar 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58a404df36eb150c74d2839d8a8fd71d726a9fe9
-  data.tar.gz: fd4f0979f0ad248b6959c3bd7e63165f3477eaef
+  metadata.gz: 5f55161aaf90f993ee60dc7a2b2a44b18de903a3
+  data.tar.gz: 467d81d5bcace2ea719ad534f639cee93b5cf884
 SHA512:
-  metadata.gz: 16678eb5c430288bf6475f0d7c9aa420932b4c1a5651fdad40d87785441740bdbfa2a329be8cf78325898c7d16010a1206027b9c1972cbabd7c99f6644a60bc4
-  data.tar.gz: 9f9505a627c30efe42802a1dc0111fe943d89e82c5931f78636045ba98d0d69bb10b75018e3af9e3964768ea7ed6bdc010d308d0adf5a099a755c923d4ea42dd
+  metadata.gz: 621a9cab01fcec48aafb331cf1535e15510c457caee852ebb440a2b6ffd24ff78d54c15f32e44908ee64eaa3d065e4972e5c29b9c48f1f99a214cdc785f93b5e
+  data.tar.gz: a0c7bc298bcce0f6a209db8faf4595f4263cf05ed2aa8f139b5c15251c59a9bf1063bad332ea647533e4223bc1d8e87cf62b96c376bedf8324dbdd477b6ae62d

data/NEWS.md

@@ -1,5 +1,14 @@
 # NEWS
 
+## 0.7.2: 2016-02-27
+
+### Changes
+
+#### Improvements
+
+  * collect: Fixed parsing complex Atom feeds.
+  * collect: Accepted filter pattern.
+
 ## 0.7.1: 2016-02-17
 
 ### Changes

data/feedcellar.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("rroonga", ">= 5.0.0")
   spec.add_runtime_dependency("thor")
   spec.add_runtime_dependency("parallel")
+  spec.add_runtime_dependency("feedjira")
 
   spec.add_development_dependency("test-unit")
   spec.add_development_dependency("test-unit-notify")

data/lib/feedcellar/command.rb

@@ -89,14 +89,19 @@ module Feedcellar
       end
     end
 
-    desc "collect", "Collect feeds from WWW."
+    desc "collect [FILTER_PATTERN]", "Collect feeds from WWW."
     option :parallel, :type => :boolean, :desc => "run on multiple processes"
-    def collect
+    def collect(filter_pattern=nil)
       GroongaDatabase.new.open(@database_dir) do |database|
         resources = database.resources
         collect_proc = lambda do |record|
           feed_url = record.xmlUrl
+
           next unless feed_url
+          if filter_pattern
+            regexp = Regexp.new(filter_pattern)
+            next unless regexp =~ feed_url
+          end
 
           items = Feed.parse(feed_url)
           next unless items

data/lib/feedcellar/feed.rb

@@ -1,6 +1,6 @@
 # class Feedcellar::Feed
 #
-# Copyright (C) 2013-2014  Masafumi Yokoyama <myokoym@gmail.com>
+# Copyright (C) 2013-2016  Masafumi Yokoyama <myokoym@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,7 +16,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "rss"
+require "feedjira"
 
 module Feedcellar
   class Feed
@@ -32,32 +32,18 @@ module Feedcellar
       feeds = []
 
       begin
-        rss = RSS::Parser.parse(feed_url)
-      rescue RSS::InvalidRSSError
-        begin
-          rss = RSS::Parser.parse(feed_url, false)
-        rescue
-          $stderr.puts "WARNING: #{$!} (#{feed_url})"
-          return nil
-        end
+        rss = Feedjira::Feed.fetch_and_parse(feed_url)
       rescue
         $stderr.puts "WARNING: #{$!} (#{feed_url})"
         return nil
       end
       return nil unless rss
 
-      rss.items.each do |item|
-        if rss.is_a?(RSS::Atom::Feed)
-          title = item.title.content
-          link = item.link.href if item.link
-          description = item.summary.content if item.summary
-          date = item.updated.content if item.updated
-        else
-          title = item.title
-          link = item.link
-          description = item.description
-          date = item.date
-        end
+      rss.entries.each do |entry|
+        title = entry.title
+        link = entry.url
+        description = entry.summary || entry.content
+        date = entry.published || entry.updated
 
         next unless link
 

data/lib/feedcellar/version.rb

@@ -17,5 +17,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Feedcellar
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedcellar
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: feedjira
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement