feedcellar 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51ea5cd90472416d725cd56331eed41d118068a7
-  data.tar.gz: 49485354cc51a62bd6de68d3415d40829dd7e76d
+  metadata.gz: 58a404df36eb150c74d2839d8a8fd71d726a9fe9
+  data.tar.gz: fd4f0979f0ad248b6959c3bd7e63165f3477eaef
 SHA512:
-  metadata.gz: 49fb61eb5b7dd8b6dd09cff3d81b8e7ba03dab46ec7e78b9b378432cea67816660edecd7c76bbef3db5dea2d39773052e8779a706955cbaf2a3078944bd05017
-  data.tar.gz: ca2e4666fefdf69db4badd5da346fd254a45fd74d697e04b63310906c9d90a30e31edad8d7083e8514fa495de28299a5eecffea987ce41eefdacd182b7279649
+  metadata.gz: 16678eb5c430288bf6475f0d7c9aa420932b4c1a5651fdad40d87785441740bdbfa2a329be8cf78325898c7d16010a1206027b9c1972cbabd7c99f6644a60bc4
+  data.tar.gz: 9f9505a627c30efe42802a1dc0111fe943d89e82c5931f78636045ba98d0d69bb10b75018e3af9e3964768ea7ed6bdc010d308d0adf5a099a755c923d4ea42dd

data/NEWS.md

@@ -1,5 +1,13 @@
 # NEWS
 
+## 0.7.1: 2016-02-17
+
+### Changes
+
+#### Improvements
+
+  * Supported "OR" operator.
+
 ## 0.7.0: 2016-02-17
 
 Speed up.

data/lib/feedcellar/groonga_searcher.rb

@@ -1,6 +1,6 @@
 # class Feedcellar::GroongaSearcher
 #
-# Copyright (C) 2013-2015  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
@@ -56,9 +56,21 @@ module Feedcellar
           expression_builder = feed
 
           if (!words.nil? && !words.empty?)
+            or_flag = false
             words.each do |word|
-              expression_builder &= (feed.title =~ word) |
-                                      (feed.description =~ word)
+              if word == "OR"
+                or_flag = true
+                next
+              end
+
+              if or_flag
+                expression_builder |= (feed.title =~ word) |
+                                        (feed.description =~ word)
+                or_flag = false
+              else
+                expression_builder &= (feed.title =~ word) |
+                                        (feed.description =~ word)
+              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.7.0"
+  VERSION = "0.7.1"
 end

data/test/test-groonga_searcher.rb

@@ -2,7 +2,7 @@
 #
 # class GroongaSearcherTest
 #
-# Copyright (C) 2015  Masafumi Yokoyama <myokoym@gmail.com>
+# Copyright (C) 2015-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
@@ -39,24 +39,45 @@ class GroongaSearcherTest < Test::Unit::TestCase
   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)
+      @database.add("key1",
+                    "Title1",
+                    "http://null.myokoym.net/1",
+                    "The site is fiction.",
+                    Time.new(2014, 2, 5))
+      @database.add("key2",
+                    "Title2",
+                    "http://null.myokoym.net/2",
+                    "The site is fiction.",
+                    Time.new(2015, 3, 6))
     end
 
     def test_all_records
       feeds = Feedcellar::GroongaSearcher.search(@database, [])
-      assert_equal(1, feeds.size)
+      assert_equal(2, feeds.size)
     end
 
     def test_found
       words = []
       words << "fiction"
       feeds = Feedcellar::GroongaSearcher.search(@database, words)
-      assert_equal(1, feeds.size)
+      assert_equal(2, feeds.size)
+    end
+
+    def test_and
+      words = []
+      words << "fiction"
+      words << "Title1"
+      feeds = Feedcellar::GroongaSearcher.search(@database, words)
+      assert_equal(["Title1"], feeds.map(&:title))
+    end
+
+    def test_or
+      words = []
+      words << "Title1"
+      words << "OR"
+      words << "Title2"
+      feeds = Feedcellar::GroongaSearcher.search(@database, words)
+      assert_equal(["Title1", "Title2"], feeds.map(&:title).sort)
     end
 
     def test_year_found
@@ -64,7 +85,7 @@ class GroongaSearcherTest < Test::Unit::TestCase
         :year => 2014,
       }
       feeds = Feedcellar::GroongaSearcher.search(@database, [], options)
-      assert_equal(1, feeds.size)
+      assert_equal(["Title1"], feeds.map(&:title))
     end
 
     def test_year_not_found
@@ -73,6 +94,7 @@ class GroongaSearcherTest < Test::Unit::TestCase
       }
       feeds = Feedcellar::GroongaSearcher.search(@database, [], options)
       assert_equal(0, feeds.size)
+      assert_equal([], feeds.map(&:title))
     end
 
     def test_month_found
@@ -81,6 +103,7 @@ class GroongaSearcherTest < Test::Unit::TestCase
       }
       feeds = Feedcellar::GroongaSearcher.search(@database, [], options)
       assert_equal(1, feeds.size)
+      assert_equal(["Title1"], feeds.map(&:title))
     end
 
     def test_month_not_found
@@ -89,6 +112,7 @@ class GroongaSearcherTest < Test::Unit::TestCase
       }
       feeds = Feedcellar::GroongaSearcher.search(@database, [], options)
       assert_equal(0, feeds.size)
+      assert_equal([], feeds.map(&:title))
     end
 
     def test_year_and_month
@@ -97,7 +121,7 @@ class GroongaSearcherTest < Test::Unit::TestCase
         :month => 2,
       }
       feeds = Feedcellar::GroongaSearcher.search(@database, [], options)
-      assert_equal(1, feeds.size)
+      assert_equal(["Title1"], feeds.map(&:title))
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feedcellar
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Masafumi Yokoyama