feedcellar 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b0b56bc49519216392bb6b0554492c44760f5c0
-  data.tar.gz: 3712ec8b64294e089f4cf1be5f5437f3344ea0b9
+  metadata.gz: 9702dd39c1fc809f99edbc966c15b775417246d8
+  data.tar.gz: aa5d0688709824dbd2fd7663b8b2ed35233381de
 SHA512:
-  metadata.gz: 73a494cdbe21660f88e8c3b85b88b5a1950d6ae36267d7d7e5d7c5d42576bdebfb518bbae7d1701a4ec02cf7bf2c640568b507a2bc52e910ad8ac5adf9127d2d
-  data.tar.gz: 2679352036daeeafb087b32b4a8b22b1ded9f1cd37698448b21f9812984fe081eb4c826504c6e8ac00a4858ebee1d7b3c48e28bcdea8980433eac1657a304e33
+  metadata.gz: 6d94b13da24e5f1a2007f3ef03fc9a8e23f0bbec5654090c3e673a8d4c9ee18880bfdf26f01f794e310b158190b53585ef6e102df79f0666321e957d1119e779
+  data.tar.gz: f25da1c3fbfc51520f42c8c5ab4b54b601721791375feb9d23e025a45a56a4f2c5a59e166367920a0b1de0ef7c0f3f9c9a1ad0a81c0347fc82252721c761d78c

data/NEWS.md

@@ -1,5 +1,25 @@
 # NEWS
 
+## 0.6.0: 2015-04-06
+
+Support date related columns such as month.
+
+### Changes
+
+#### Improvements
+
+  *  Supported to delete a feed by key.
+  *  Supported delete feeds by resource key.
+  *  Added delete command to delete feeds.
+  *  Added month column for drilldown.
+  *  Added wday column to Feed.
+  *  Added year column to Feed.
+  *  Added day column to Feeds table.
+  *  search: Supported year option.
+  *  search: Supported month option.
+  *  Use Rroonga 5.0.0 or later for multiple column drilldown.
+  *  Added reset command.
+
 ## 0.5.0: 2015-04-05
 
 Extract interfaces to the other projects.

data/README.md

@@ -1,7 +1,7 @@
 # feedcellar - a feed reader
 
 [![Gem Version](https://badge.fury.io/rb/feedcellar.svg)](http://badge.fury.io/rb/feedcellar)
-[![Build Status](https://secure.travis-ci.org/myokoym/feedcellar.png?branch=master)](http://travis-ci.org/myokoym/feedcellar)
+[![Build Status](https://secure.travis-ci.org/feedcellar/feedcellar.png?branch=master)](http://travis-ci.org/feedcellar/feedcellar)
 
 Feedcellar is a full-text searchable RSS feed reader and data store.
 
@@ -57,6 +57,16 @@ Powered by [Groonga][] (via [Rroonga][]) with [Ruby][].
 
 [Feedcellar::Curses](https://github.com/feedcellar/feedcellar-curses)
 
+### Delete feeds
+
+Delete a feed:
+
+    $ feedcellar delete URL
+
+Delete feeds related registered resource URL:
+
+    $ feedcellar delete --resource URL
+
 ### Delete database
 
     $ rm -r ~/.feedcellar

data/feedcellar.gemspec

@@ -30,14 +30,14 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Feedcellar is a full-text searchable RSS feed reader and data store by Groonga (via Rroonga) with Ruby.}
   spec.summary       = %q{Full-Text Searchable RSS Feed Reader by Groonga}
   spec.homepage      = "http://myokoym.net/feedcellar/"
-  spec.license       = "LGPLv2.1 or later"
+  spec.license       = "LGPLv2.1+"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) {|f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency("rroonga", ">= 3.0.4")
+  spec.add_runtime_dependency("rroonga", ">= 5.0.0")
   spec.add_runtime_dependency("thor")
 
   spec.add_development_dependency("test-unit")

data/lib/feedcellar/command.rb

@@ -108,6 +108,32 @@ module Feedcellar
       end
     end
 
+    desc "reset", "Reset all feeds for adding columns."
+    def reset
+      GroongaDatabase.new.open(@database_dir) do |database|
+        feeds = GroongaSearcher.search(database, nil)
+        feeds.each do |feed|
+          database.add(feed.resource.key,
+                       feed.title,
+                       feed.link,
+                       feed.description,
+                       feed.date)
+        end
+      end
+    end
+
+    desc "delete URL", "Delete feeds by URL."
+    option :resource, :type => :boolean, :desc => "Delete registered URL related feeds"
+    def delete(url)
+      GroongaDatabase.new.open(@database_dir) do |database|
+        if options[:resource]
+          database.delete(:resource_key => url)
+        else
+          database.delete(url)
+        end
+      end
+    end
+
     desc "latest", "Show latest feeds by resources."
     def latest
       GroongaDatabase.new.open(@database_dir) do |database|

data/lib/feedcellar/groonga_database.rb

@@ -1,6 +1,6 @@
 # class Feedcellar::GroongaDatabase
 #
-# Copyright (C) 2013-2014  Masafumi Yokoyama <myokoym@gmail.com>
+# Copyright (C) 2013-2015  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,6 +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 "date"
 require "groonga"
 
 module Feedcellar
@@ -29,13 +30,7 @@ module Feedcellar
       path = File.join(base_path, "feedcellar.db")
       if File.exist?(path)
         @database = Groonga::Database.open(path)
-        begin
-          populate_schema
-        rescue Groonga::Schema::ColumnCreationWithDifferentOptions
-          # NOTE: migrate to feedcellar-0.3.0 from 0.2.2 or earlier.
-          populate_new_schema
-          transform_resources_key
-        end
+        populate_schema
       else
         FileUtils.mkdir_p(base_path)
         populate(path)
@@ -54,15 +49,56 @@ module Feedcellar
     end
 
     def add(resource_key, title, link, description, date)
-      feeds.add(link, :resource    => resources[resource_key],
-                      :title       => title,
-                      :link        => link,
-                      :description => description,
-                      :date        => date)
-    end
-
-    def delete(id)
-      feeds.delete(id)
+      columns = {
+        :resource    => resources[resource_key],
+        :title       => title,
+        :link        => link,
+        :description => description,
+        :date        => date,
+      }
+      if date
+        if feeds.have_column?(:year)
+          columns[:year] = date.year
+        end
+        if feeds.have_column?(:month)
+          columns[:month] = date.month
+        end
+        if feeds.have_column?(:day)
+          columns[:day] = date.day
+        end
+        if feeds.have_column?(:wday)
+          columns[:wday] = Date.new(date.year, date.month, date.day).wday
+        end
+      end
+      feeds.add(link, columns)
+    end
+
+    def delete(id_or_key_or_conditions)
+      if id_or_key_or_conditions.is_a?(Integer)
+        id = id_or_key_or_conditions
+        feeds.delete(id, :id => true)
+      elsif id_or_key_or_conditions.is_a?(String)
+        key = id_or_key_or_conditions
+        feeds.delete(key)
+      elsif id_or_key_or_conditions.is_a?(Hash)
+        conditions = id_or_key_or_conditions
+        feeds.delete do |record|
+          expression_builder = nil
+          conditions.each do |key, value|
+            case key
+            when :resource_key
+              record &= (record.resource._key == value)
+            else
+              raise ArgumentError,
+                    "Not supported condition: <#{key}>"
+            end
+          end
+          record
+        end
+      else
+        raise ArgumentError,
+              "Not supported type: <#{id_or_conditions.class}>"
+      end
     end
 
     def unregister(title_or_url)
@@ -126,6 +162,10 @@ module Feedcellar
           table.short_text("title")
           table.short_text("link")
           table.text("description")
+          table.integer16("year")
+          table.integer8("month")
+          table.integer8("day")
+          table.integer8("wday")
           table.time("date")
         end
 
@@ -138,92 +178,5 @@ module Feedcellar
         end
       end
     end
-
-    def populate_new_schema
-      populate_old_schema
-      add_new_column
-      migrate_value
-      delete_old_column
-    end
-
-    def transform_resources_key
-      resources.each do |resource|
-        next unless resource.xmlUrl
-        values = resource.attributes.reject do |key, value|
-          /^_/ =~ key
-        end
-        resources.add(resource.xmlUrl, values)
-        resources.delete(resource.id)
-      end
-    end
-
-    def populate_old_schema
-      Groonga::Schema.define do |schema|
-        schema.create_table("Resources", :type => :hash) do |table|
-          table.text("text")
-          table.short_text("isComment")
-          table.short_text("isBreakpoint")
-          table.short_text("created")
-          table.short_text("category")
-          table.text("description")
-          table.short_text("url")
-          table.short_text("htmlUrl")
-          table.short_text("xmlUrl")
-          table.short_text("title")
-          table.short_text("version")
-          table.short_text("language")
-        end
-
-        schema.create_table("Feeds", :type => :hash) do |table|
-          table.short_text("resource")
-          table.short_text("title")
-          table.short_text("link")
-          table.text("description")
-          table.time("date")
-        end
-
-        schema.create_table("Terms",
-                            :type => :patricia_trie,
-                            :normalizer => "NormalizerAuto",
-                            :default_tokenizer => "TokenBigram") do |table|
-          table.index("Feeds.title")
-          table.index("Feeds.description")
-        end
-      end
-    end
-
-    def add_new_column
-      Groonga::Schema.define do |schema|
-        schema.change_table("Feeds") do |table|
-          table.reference("new_resource", "Resources")
-        end
-      end
-    end
-
-    def migrate_value
-      feeds = Groonga["Feeds"]
-      resources = Groonga["Resources"]
-      tmp_resources = {}
-      resources.each do |resource|
-        tmp_resources[resource.xmlUrl] = resource.title
-      end
-
-      feeds.each do |feed|
-        feed["new_resource"] = resources[tmp_resources[feed.resource]]
-        feed["resource"] = nil
-      end
-    end
-
-    def delete_old_column
-      Groonga::Schema.define do |schema|
-        schema.change_table("Feeds") do |table|
-          table.remove_column("resource")
-        end
-
-        schema.change_table("Feeds") do |table|
-          table.rename_column("new_resource", "resource")
-        end
-      end
-    end
   end
 end

data/lib/feedcellar/groonga_searcher.rb

@@ -1,6 +1,6 @@
 # class Feedcellar::GroongaSearcher
 #
-# Copyright (C) 2013-2014  Masafumi Yokoyama <myokoym@gmail.com>
+# Copyright (C) 2013-2015  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
@@ -19,56 +19,15 @@
 module Feedcellar
   class GroongaSearcher
     class << self
-      def search(database, words, options)
+      def search(database, words, options={})
         feeds = database.feeds
-
-        if (!words.nil? && !words.empty?) || options[:resource_id]
-          feeds = feeds.select do |feed|
-            expression = nil
-            words.each do |word|
-              sub_expression = (feed.title =~ word) |
-                               (feed.description =~ word)
-              if expression.nil?
-                expression = sub_expression
-              else
-                expression &= sub_expression
-              end
-            end
-
-            if options[:mtime]
-              base_date = (Time.now - (options[:mtime] * 60 * 60 * 24))
-              mtime_expression = feed.date > base_date
-              if expression.nil?
-                expression = mtime_expression
-              else
-                expression &= mtime_expression
-              end
-            end
-
-            if options[:resource]
-              resource_expression = feed.resource =~ options[:resource]
-              if expression.nil?
-                expression = resource_expression
-              else
-                expression &= resource_expression
-              end
-            end
-
-            if options[:resource_id]
-              resource_expression = feed.resource._id == options[:resource_id]
-              if expression.nil?
-                expression = resource_expression
-              else
-                expression &= resource_expression
-              end
-            end
-
-            expression
-          end
-        end
+        selected_feeds = select_feeds(feeds, words, options)
 
         order = options[:reverse] ? "ascending" : "descending"
-        sorted_feeds = feeds.sort([{:key => "date", :order => order}])
+        sorted_feeds = selected_feeds.sort([{
+                                              :key => "date",
+                                              :order => order,
+                                            }])
 
         sorted_feeds
       end
@@ -86,6 +45,49 @@ module Feedcellar
 
         latest_feeds
       end
+
+      private
+      def select_feeds(feeds, words, options)
+        if (words.nil? || words.empty?) && options.empty?
+          return feeds
+        end
+
+        selected_feeds = feeds.select do |feed|
+          expression_builder = feed
+
+          if (!words.nil? && !words.empty?)
+            words.each do |word|
+              expression_builder &= (feed.title =~ word) |
+                                      (feed.description =~ word)
+            end
+          end
+
+          if options[:mtime]
+            base_date = (Time.now - (options[:mtime] * 60 * 60 * 24))
+            expression_builder &= feed.date > base_date
+          end
+
+          if options[:resource]
+            expression_builder &= feed.resource =~ options[:resource]
+          end
+
+          if options[:resource_id]
+            expression_builder &= feed.resource._id == options[:resource_id]
+          end
+
+          if options[:year] && feeds.have_column?(:year)
+            expression_builder &= feed.year == options[:year]
+          end
+
+          if options[:month] && feeds.have_column?(:month)
+            expression_builder &= feed.month == options[:month]
+          end
+
+          expression_builder
+        end
+
+        selected_feeds
+      end
     end
   end
 end

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.5.0"
+  VERSION = "0.6.0"
 end

data/test/test-command.rb

@@ -2,7 +2,7 @@
 #
 # class CommandTest
 #
-# Copyright (C) 2013-2014  Masafumi Yokoyama <myokoym@gmail.com>
+# Copyright (C) 2013-2015  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
@@ -25,26 +25,24 @@ require "feedcellar/command"
 require "feedcellar/groonga_database"
 
 class CommandTest < Test::Unit::TestCase
-  class << self
-    def startup
-      @@tmpdir = File.join(File.dirname(__FILE__), "tmp")
-      FileUtils.rm_rf(@@tmpdir)
-      FileUtils.mkdir_p(@@tmpdir)
-      ENV["FEEDCELLAR_HOME"] = @@tmpdir
-      @@command = Feedcellar::Command.new
-      @@database_dir = @@command.database_dir
-    end
+  def setup
+    @tmpdir = File.join(File.dirname(__FILE__), "tmp")
+    FileUtils.rm_rf(@tmpdir)
+    FileUtils.mkdir_p(@tmpdir)
+    ENV["FEEDCELLAR_HOME"] = @tmpdir
+    @command = Feedcellar::Command.new
+    @database_dir = @command.database_dir
+  end
 
-    def shutdown
-      FileUtils.rm_rf(@@tmpdir)
-    end
+  def teardown
+    FileUtils.rm_rf(@tmpdir)
   end
 
   def test_version
     s = ""
     io = StringIO.new(s)
     $stdout = io
-    @@command.version
+    @command.version
     assert_equal("#{Feedcellar::VERSION}\n", s)
     $stdout = STDOUT
   end
@@ -54,22 +52,39 @@ class CommandTest < Test::Unit::TestCase
     s = ""
     io = StringIO.new(s)
     $stderr = io
-    assert_equal(1, @@command.register("hoge"))
+    assert_equal(1, @command.register("hoge"))
     assert_equal("ERROR: Invalid URL\n", s)
     $stderr = STDERR
 
     # confirm register command
-    @@command.register("http://myokoym.github.io/entries.rss")
-    @@command.register("https://rubygems.org/gems/mister_fairy/versions.atom")
-    Feedcellar::GroongaDatabase.new.open(@@database_dir) do |database|
+    resources = nil
+    resources_path = File.join(fixtures_dir, "resources.dump")
+    File.open(resources_path, "rb") do |file|
+      resources = Marshal.load(file)
+    end
+    mock(Feedcellar::Resource).parse("http://myokoym.github.io/entries.rss") {resources[0]}
+    mock(Feedcellar::Resource).parse("https://rubygems.org/gems/mister_fairy/versions.atom") {resources[1]}
+    @command.register("http://myokoym.github.io/entries.rss")
+    @command.register("https://rubygems.org/gems/mister_fairy/versions.atom")
+    Feedcellar::GroongaDatabase.new.open(@database_dir) do |database|
       assert_equal(2, database.resources.size)
     end
 
     # confirm import command
-    file = File.join(File.dirname(__FILE__), "fixtures", "subscriptions.xml")
-    @@command.import(file)
-    @@command.collect
-    Feedcellar::GroongaDatabase.new.open(@@database_dir) do |database|
+    file = File.join(fixtures_dir, "subscriptions.xml")
+    @command.import(file)
+
+    feeds = nil
+    feeds_path = File.join(fixtures_dir, "feeds.dump")
+    File.open(feeds_path, "rb") do |file|
+      feeds = Marshal.load(file)
+    end
+    mock(Feedcellar::Feed).parse("http://myokoym.github.io/entries.rss") {feeds[0]}
+    mock(Feedcellar::Feed).parse("https://rubygems.org/gems/mister_fairy/versions.atom") {feeds[1]}
+    mock(Feedcellar::Feed).parse("http://blogs.yahoo.co.jp/mi807258/rss.xml") {feeds[2]}
+    @command.collect
+
+    Feedcellar::GroongaDatabase.new.open(@database_dir) do |database|
       # NOTE: a tag of outline is not register.
       assert_equal(3, database.resources.size)
       assert_true(database.feeds.count > 0)
@@ -79,7 +94,7 @@ class CommandTest < Test::Unit::TestCase
     s = ""
     io = StringIO.new(s)
     $stdout = io
-    @@command.export
+    @command.export
     assert_equal(1, s.scan(/<opml/).size)
     assert_equal(3, s.scan(/<outline/).size)
     $stdout = STDOUT
@@ -88,17 +103,17 @@ class CommandTest < Test::Unit::TestCase
     s = ""
     io = StringIO.new(s)
     $stdout = io
-    @@command.search("ruby")
+    @command.search("ruby")
     assert_true(s.size > 100)
     $stdout = STDOUT
 
     # confirm unregister command
-    @@command.unregister("my_letter")
-    Feedcellar::GroongaDatabase.new.open(@@database_dir) do |database|
+    @command.unregister("my_letter")
+    Feedcellar::GroongaDatabase.new.open(@database_dir) do |database|
       assert_equal(2, database.resources.size)
     end
-    @@command.unregister("https://rubygems.org/gems/mister_fairy/versions.atom")
-    Feedcellar::GroongaDatabase.new.open(@@database_dir) do |database|
+    @command.unregister("https://rubygems.org/gems/mister_fairy/versions.atom")
+    Feedcellar::GroongaDatabase.new.open(@database_dir) do |database|
       assert_equal(1, database.resources.size)
     end
 
@@ -106,8 +121,94 @@ class CommandTest < Test::Unit::TestCase
     s = ""
     io = StringIO.new(s)
     $stdout = io
-    @@command.latest
+    @command.latest
     assert_true(s.size > 0)
     $stdout = STDOUT
   end
+
+  def test_reset
+    @database = Feedcellar::GroongaDatabase.new
+    @database.open(@database_dir)
+    Groonga["Resources"].add("http://my.today/atom")
+    @database.add("http://my.today/atom",
+                  "What is Today?",
+                  "http://my.today/201501",
+                  "I don't know.",
+                  nil)
+    assert_equal(0, @database.__send__(:feeds).first.year)
+    Groonga["Feeds"].add("http://my.today/201501",
+                         {
+                           :resource => "http://my.today/atom",
+                           :title => "What is Today?",
+                           :link => "http://my.today/201501",
+                           :description => "January 1, 2015.",
+                           :date => Time.new(2015, 1, 1),
+                         })
+    @command.reset
+    assert_equal(2015, @database.__send__(:feeds).first.year)
+  end
+
+  private
+  def fixtures_dir
+    File.join(File.dirname(__FILE__), "fixtures")
+  end
+
+  class DeleteTest < self
+    def setup
+      super
+      resources = nil
+      resources_path = File.join(fixtures_dir, "resources.dump")
+      File.open(resources_path, "rb") do |file|
+        resources = Marshal.load(file)
+      end
+      mock(Feedcellar::Resource).parse("http://myokoym.github.io/entries.rss") {resources[0]}
+      @command.register("http://myokoym.github.io/entries.rss")
+      feeds = nil
+      feeds_path = File.join(fixtures_dir, "feeds.dump")
+      File.open(feeds_path, "rb") do |file|
+        feeds = Marshal.load(file)
+      end
+      mock(Feedcellar::Feed).parse("http://myokoym.github.io/entries.rss") {feeds[0]}
+      @command.collect
+    end
+
+    def teardown
+      super
+      $stdout = STDOUT
+    end
+
+    def test_by_link
+      @str = ""
+      io = StringIO.new(@str)
+      $stdout = io
+      @command.search("ruby")
+      $stdout = STDOUT
+      assert_equal(13, @str.lines.size)
+
+      @command.delete("http://myokoym.github.com/entries/20131201/a0.html")
+
+      @str = ""
+      io = StringIO.new(@str)
+      $stdout = io
+      @command.search("ruby")
+      assert_equal(12, @str.lines.size)
+    end
+
+    def test_by_resource_key
+      @str = ""
+      io = StringIO.new(@str)
+      $stdout = io
+      @command.search("ruby")
+      $stdout = STDOUT
+      assert_equal(13, @str.lines.size)
+
+      @command.delete(:resource_key => "http://myokoym.github.io/entries.rss")
+
+      @str = ""
+      io = StringIO.new(@str)
+      $stdout = io
+      @command.search("ruby")
+      assert_equal(0, @str.lines.size)
+    end
+  end
 end

data/test/test-groonga_database.rb

@@ -0,0 +1,113 @@
+# -*- coding: utf-8 -*-
+#
+# class GroongaDatabaseTest
+#
+# Copyright (C) 2015  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# 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 "feedcellar/groonga_database"
+
+class GroongaDatabaseTest < Test::Unit::TestCase
+  def setup
+    @tmpdir = File.join(File.dirname(__FILE__), "tmp")
+    FileUtils.rm_rf(@tmpdir)
+    FileUtils.mkdir_p(@tmpdir)
+    ENV["FEEDCELLAR_HOME"] = @tmpdir
+  end
+
+  def teardown
+    FileUtils.rm_rf(@tmpdir)
+  end
+
+  def test_new
+    @database = Feedcellar::GroongaDatabase.new
+    assert_not_nil(@database)
+  end
+
+  def test_open
+    @database = Feedcellar::GroongaDatabase.new
+    assert_nil(@database.instance_variable_get(:@database))
+    @database.open(@tmpdir)
+    assert_not_nil(@database.instance_variable_get(:@database))
+  end
+
+  def test_unregister
+    @database = Feedcellar::GroongaDatabase.new
+    @database.register("key", {:title => "Nikki"})
+    assert_equal(1, @database.__send__(:resources).size)
+    @database.unregister("Nikki")
+    assert_equal(0, @database.__send__(:resources).size)
+  end
+
+  def test_delete_by_key
+    @database = Feedcellar::GroongaDatabase.new
+    @database.open(@tmpdir)
+    @database.add("resource",
+                  "Today's lunch",
+                  "http://my.nikki/123",
+                  "So cute.",
+                  Time.now)
+    assert_equal(1, @database.__send__(:feeds).size)
+    @database.delete("http://my.nikki/123")
+    assert_equal(0, @database.__send__(:feeds).size)
+  end
+
+  def test_delete_by_resource_key
+    @database = Feedcellar::GroongaDatabase.new
+    @database.open(@tmpdir)
+    @database.register("http://my.diary/rss", {:title => "My Diary"})
+    2.times do |i|
+      @database.add("http://my.diary/rss",
+                    "Today's dinnar",
+                    "http://my.diary/#{i}",
+                    "So mad.",
+                    Time.now)
+    end
+    assert_equal(2, @database.__send__(:feeds).size)
+    @database.delete(:resource_key => "http://my.diary/rss")
+    assert_equal(0, @database.__send__(:feeds).size)
+  end
+
+  class AddTest < self
+    def setup
+      super
+      @database = Feedcellar::GroongaDatabase.new
+      @database.open(@tmpdir)
+      @database.add("http://my.monthly/atom",
+                    "What is month Today?",
+                    "http://my.monthly/201504",
+                    "April...f...",
+                    Time.new(2015, 4, 5))
+      @feed = @database.__send__(:feeds).first
+    end
+
+    def test_year
+      assert_equal(2015, @feed.year)
+    end
+
+    def test_month
+      assert_equal(4, @feed.month)
+    end
+
+    def test_day
+      assert_equal(5, @feed.day)
+    end
+
+    def test_wday
+      assert_equal(0, @feed.wday)
+    end
+  end
+end

data/test/test-groonga_searcher.rb

@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+#
+# class GroongaSearcherTest
+#
+# Copyright (C) 2015  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# 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 "feedcellar/groonga_database"
+require "feedcellar/groonga_searcher"
+
+class GroongaSearcherTest < Test::Unit::TestCase
+  def setup
+    @tmpdir = File.join(File.dirname(__FILE__), "tmp")
+    FileUtils.rm_rf(@tmpdir)
+    FileUtils.mkdir_p(@tmpdir)
+    ENV["FEEDCELLAR_HOME"] = @tmpdir
+    @database = Feedcellar::GroongaDatabase.new
+    @database.open(@tmpdir)
+  end
+
+  def teardown
+    @database.close
+    FileUtils.rm_rf(@tmpdir)
+  end
+
+  class SearchTest < self
+    def setup
+      super
+      resource_key = "http://null.myokoym.net/rss"
+      title = "Test"
+      link = "http://null.myokoym.net/"
+      description = "The site is fiction."
+      date = Time.new(2014, 2, 5)
+      @database.add(resource_key, title, link, description, date)
+    end
+
+    def test_all_records
+      feeds = Feedcellar::GroongaSearcher.search(@database, [])
+      assert_equal(1, feeds.size)
+    end
+
+    def test_found
+      words = []
+      words << "fiction"
+      feeds = Feedcellar::GroongaSearcher.search(@database, words)
+      assert_equal(1, feeds.size)
+    end
+
+    def test_year_found
+      options = {
+        :year => 2014,
+      }
+      feeds = Feedcellar::GroongaSearcher.search(@database, [], options)
+      assert_equal(1, feeds.size)
+    end
+
+    def test_year_not_found
+      options = {
+        :year => 2013,
+      }
+      feeds = Feedcellar::GroongaSearcher.search(@database, [], options)
+      assert_equal(0, feeds.size)
+    end
+
+    def test_month_found
+      options = {
+        :month => 2,
+      }
+      feeds = Feedcellar::GroongaSearcher.search(@database, [], options)
+      assert_equal(1, feeds.size)
+    end
+
+    def test_month_not_found
+      options = {
+        :year => 3,
+      }
+      feeds = Feedcellar::GroongaSearcher.search(@database, [], options)
+      assert_equal(0, feeds.size)
+    end
+
+    def test_year_and_month
+      options = {
+        :year => 2014,
+        :month => 2,
+      }
+      feeds = Feedcellar::GroongaSearcher.search(@database, [], options)
+      assert_equal(1, feeds.size)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedcellar
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -136,13 +136,17 @@ files:
 - lib/feedcellar/opml.rb
 - lib/feedcellar/resource.rb
 - lib/feedcellar/version.rb
+- test/fixtures/feeds.dump
+- test/fixtures/resources.dump
 - test/fixtures/subscriptions.xml
 - test/run-test.rb
 - test/test-command.rb
+- test/test-groonga_database.rb
+- test/test-groonga_searcher.rb
 - test/test-opml.rb
 homepage: http://myokoym.net/feedcellar/
 licenses:
-- LGPLv2.1 or later
+- LGPLv2.1+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -160,13 +164,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Full-Text Searchable RSS Feed Reader by Groonga
 test_files:
+- test/fixtures/feeds.dump
+- test/fixtures/resources.dump
 - test/fixtures/subscriptions.xml
 - test/run-test.rb
 - test/test-command.rb
+- test/test-groonga_database.rb
+- test/test-groonga_searcher.rb
 - test/test-opml.rb
-has_rdoc: