feedcellar 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08349a53320968c7d67ee7ee77d0c6a0e6d8141c
-  data.tar.gz: 612e284fddb33c71c2035bc4f07ea6b3058feb63
+  metadata.gz: c68cc360529496d84b72f86f7bde1c3da53a54fa
+  data.tar.gz: 35ac9e19d288b2454cf8442077d1b41f7e3eae44
 SHA512:
-  metadata.gz: 7a3f12931734d1dd9f4a7a55b2b6f0f5b73ac24134fa186787885eacaed0c0773675c3540c5a685ff637915322d05a15b2ac1adde39a37d072ef90c211d3852e
-  data.tar.gz: 07444c6e22023537652c9836dbd20d2ae72a1461da9672c4991ea8cf983eacc6376b6faff5a2051684babeab565af7398289d102f38bedc6d2069959c262608a
+  metadata.gz: b77c019cd534abc6b58cdee970c8cf69223947770c58ecbc65ab66766672ab91df965edff6495e9a4da2ac86a004da0e9909c4dc99dd577f627999ce5be47b54
+  data.tar.gz: 0d29006fbcf81628d0dcf7b746b721b1c79edfb49b9344dc4a3402b146b6219b36f02a8101a338a963bc450608dbb206c73a96ad68d36120c36f88b99daa1917

data/NEWS.md

@@ -1,5 +1,17 @@
 # NEWS
 
+## 0.2.2: 2013-06-16
+
+Improve search command release!
+
+### Changes
+
+  * Improvements
+    * Support multi word for search command
+    * Remove an API option from search command
+    * Add resource option to search command
+    * Add mtime option to search command
+
 ## 0.2.1: 2013-06-10
 
 Fix output format of search command.

data/lib/feedcellar/command.rb

@@ -85,35 +85,51 @@ module Feedcellar
     option :browser, :type => :boolean, :desc => "open *ALL* links in browser"
     option :long, :type => :boolean, :aliases => "-l", :desc => "use a long listing format"
     option :reverse, :type => :boolean, :aliases => "-r", :desc => "reverse order while sorting"
-    def search(word, api=false)
+    option :mtime, :type => :numeric, :desc => "feed's data was last modified n*24 hours ago."
+    option :resource, :type => :string, :desc => "search of partial match by feed's resource url"
+    def search(*words)
       GroongaDatabase.new.open(@database_dir) do |database|
-        feeds = database.feeds.select do |v|
-          (v.title =~ word) | (v.description =~ word)
+        feeds = database.feeds
+        words.each do |word|
+        feeds = feeds.select do |feed|
+          (feed.title =~ word) | (feed.description =~ word)
+        end
+        end
+
+        if options[:mtime]
+          feeds = feeds.select do |feed|
+            feed.date > (Time.now - (options[:mtime] * 60 * 60 * 24))
+          end
+        end
+
+        if options[:resource]
+          feeds = feeds.select do |feed|
+            feed.resource =~ options[:resource]
+          end
         end
 
         order = options[:reverse] ? "descending" : "ascending"
         sorted_feeds = feeds.sort([{:key => "date", :order => order}])
-        return sorted_feeds if api
 
-        sorted_feeds.each do |record|
-          resources = database.resources.select do |v|
-            v.xmlUrl == record.resource
+        sorted_feeds.each do |feed|
+          resources = database.resources.select do |resource|
+            resource.xmlUrl == feed.resource
           end
           next unless resources
           next unless resources.first # FIXME
 
-          title = record.title.gsub(/\n/, " ")
+          title = feed.title.gsub(/\n/, " ")
           if options[:long]
-            date = record.date.strftime("%Y/%m/%d %H:%M")
+            date = feed.date.strftime("%Y/%m/%d %H:%M")
             resource = resources.first.title
-            puts "#{date} #{title} - #{resource} / #{record.link}"
+            puts "#{date} #{title} - #{resource} / #{feed.link}"
           else
-            date = record.date.strftime("%Y/%m/%d")
+            date = feed.date.strftime("%Y/%m/%d")
             puts "#{date} #{title}"
           end
 
           if options[:browser]
-            Gtk.show_uri(record.link) if browser_available?
+            Gtk.show_uri(feed.link) if browser_available?
           end
         end
       end
@@ -125,7 +141,7 @@ module Feedcellar
         begin
           require "gtk2"
         rescue LoadError
-          $stderr.puts "WARNNING: Sorry, browser option required \"gtk2\"."
+          $stderr.puts "WARNING: Sorry, browser option required \"gtk2\"."
           @browser = false
         else
           @browser = true

data/lib/feedcellar/feed.rb

@@ -19,11 +19,11 @@ module Feedcellar
         begin
           rss = RSS::Parser.parse(feed_url, false)
         rescue
-          $stderr.puts "WARNNING: #{$!} (#{feed_url})"
+          $stderr.puts "WARNING: #{$!} (#{feed_url})"
           return nil
         end
       rescue
-        $stderr.puts "WARNNING: #{$!} (#{feed_url})"
+        $stderr.puts "WARNING: #{$!} (#{feed_url})"
         return nil
       end
       return nil unless rss

data/lib/feedcellar/resource.rb

@@ -8,7 +8,7 @@ module Feedcellar
       rescue RSS::InvalidRSSError
         rss = RSS::Parser.parse(url, false)
       rescue
-        $stderr.puts "WARNNING: #{$!} (#{url})"
+        $stderr.puts "WARNING: #{$!} (#{url})"
         return nil
       end
 

data/lib/feedcellar/version.rb

@@ -1,3 +1,3 @@
 module Feedcellar
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/test-command.rb

@@ -60,14 +60,6 @@ class CommandTest < Test::Unit::TestCase
     $stdout = io
     @command.search("ruby")
     assert_true(s.size > 100)
-
-    # confirm search command in case of API
-    s = ""
-    io = StringIO.new(s)
-    ret = @command.search("ruby", true)
-    assert_equal(Groonga::Array, ret.class)
-    assert_equal(0, s.size)
-    assert_not_equal(0, ret.size)
     $stdout = STDOUT
 
     # confirm unregister command
@@ -79,15 +71,6 @@ class CommandTest < Test::Unit::TestCase
     Feedcellar::GroongaDatabase.new.open(@tmpdir) do |database|
       assert_equal(2, database.resources.size)
     end
-
-    # confirm search command after unregister
-    s = ""
-    io = StringIO.new(s)
-    ret = @command.search("ruby", true)
-    assert_equal(Groonga::Array, ret.class)
-    assert_equal(0, s.size)
-    assert_not_equal(0, ret.size)
-    $stdout = STDOUT
   end
 
   def teardown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedcellar
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga