fts_lite 0.1.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTAzYmM5Nzk5YTkyNmY5Mzk1Y2I0MzdhZWFhMTRmZTAzM2UyZDQxNA==
+  data.tar.gz: !binary |-
+    ODY0MzU1Y2Y1NmY3NDg3Zjk5MGYxYWVlN2JmY2Q3NTk4NjBlNTg3Nw==
+SHA512:
+  metadata.gz: !binary |-
+    ODBmNzRiODM4MTFhYjE2NjNlNzQ0ZTFmYmYyZjg2YmIyMGZhMmQ3ODYwNDNm
+    ODRjMDA2OGM2M2M0MzE2NjQzOTIxMjRjYTU5ZmI5OWQ0MTBjMWNhZTgxMTY2
+    ZDBmZThlOGFkZGZjMTMzN2VjYWRmZjFmNTcwOGQwZWFmYmYyMGE=
+  data.tar.gz: !binary |-
+    YzNhMWMxNGY0YzUwOTQ2MzhmZDAxYzMwNzg3YjhkYTg4MDdiZjczZWU3OTlh
+    ZGNjMmIxZWY1MDMwMmQyOTZjYmIzNDcwYmY0MTgyZDNiN2FiZTgzNzI4YmU3
+    ZGE3ZTQ5MzQwMGExMjI5NzIxMjQ2MzMyMWNhMDAzZDEyMGMwNjM=

data/lib/fts_lite/index.rb

@@ -37,7 +37,21 @@ module FtsLite
         Index.new(path, options)
       end
     end
-      
+
+    def sql_value(x)
+      if x.nil?
+        x
+      elsif x.is_a?(DateTime)
+        x.iso8601
+      elsif x.is_a?(Date)
+        x.iso8601
+      elsif x.is_a?(Time)
+        x.to_datetime.iso8601
+      else
+        x
+      end
+    end
+    
     def close
       @db.close
     end
@@ -52,27 +66,32 @@ module FtsLite
     def set(docid, text, sort_value = nil)
       if (SQLITE_HAVE_FT4_REPLACE)
         @db.execute("INSERT OR REPLACE INTO #{@table_name} (docid, text, sort_value) VALUES(?, ?, ?);",
-                    [docid, @tokenizer.vector(text), sort_value])
+                    [docid, @tokenizer.vector(text), sql_value(sort_value)])
       else
         begin
           @db.execute("INSERT INTO #{@table_name} (docid, text, sort_value) VALUES(?, ?, ?);",
-                      [docid, @tokenizer.vector(text), sort_value])
+                      [docid, @tokenizer.vector(text), sql_value(sort_value)])
         rescue SQLite3::ConstraintException
           @db.execute("UPDATE #{@table_name} SET text = ?, sort_value = ? WHERE docid = ?;",
-                      [@tokenizer.vector(text), sort_value, docid])
+                      [@tokenizer.vector(text), sql_value(sort_value), docid])
         end
       end
     end
     def update_sort_value(docid, sort_value)
       @db.execute("UPDATE #{@table_name} SET sort_value = ? WHERE docid = ?;",
-                  [sort_value, docid])
+                  [sql_value(sort_value), docid])
     end
     def delete(docid)
       @db.execute("DELETE FROM #{@table_name} WHERE docid = ?;", [docid])
     end
     def search(text, options = {})
+      options ||= {}
       limit = options[:limit]
       order = nil
+      gt = nil
+      lt = nil
+      gte = nil
+      lte = nil
       if (options[:order])
         case options[:order].to_sym
         when :desc
@@ -81,7 +100,25 @@ module FtsLite
           order = :asc
         end
       end
+      if (options[:range])
+        gt = options[:range][:gt]
+        lt = options[:range][:lt]
+        gte = options[:range][:gte]
+        lte = options[:range][:lte]
+      end
       sql = "SELECT docid FROM #{@table_name} WHERE text MATCH ?"
+      if gt
+        sql += " AND sort_value > ? "
+      end
+      if lt
+        sql += " AND sort_value < ? "
+      end
+      if gte
+        sql += " AND sort_value >= ? "
+      end
+      if lte
+        sql += " AND sort_value <= ? "
+      end
       if (order)
         sql += sprintf(" ORDER BY sort_value %s", order == :desc ? "DESC" : "ASC")
       else
@@ -91,7 +128,8 @@ module FtsLite
         sql += sprintf(" LIMIT %d", limit)
       end
       sql += ";"
-      @db.execute(sql, [@tokenizer.query(text, options)]).flatten
+      conditions = [gt, lt, gte, lte].reject{|v| v.nil?}.map{|v| sql_value(v)}
+      @db.execute(sql, [@tokenizer.query(text, options), conditions].flatten).flatten
     end
     def count
       @db.execute("SELECT COUNT(*) FROM #{@table_name} ;").first.first

data/lib/fts_lite/version.rb

@@ -1,3 +1,3 @@
 module FtsLite
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/test/fts_lite_test.rb

@@ -195,6 +195,38 @@ class FtsLiteTest < Test::Unit::TestCase
       assert_equal db.search("あいう", :fuzzy => false).size, 0
     end
   end
+  def test_conditions
+    db = FtsLite::Index.open(DB_FILE, :tokenizer => :bigram)
+    db.transaction do 
+      db.delete_all
+      db.set(1, "なぜナポリタンは赤いのだろうか ？", Date.new(2014, 1, 1))
+      db.set(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", Date.new(2014, 1, 2))
+      db.set(3, "それは「なぜナポリタンは赤いのだろうか」という問いである。", Date.new(2014, 1, 3))
+      
+      assert_equal db.search("ナポリタン", :order => :asc).size, 3
+      assert_equal db.search("ナポリタン", :order => :asc)[0], 1
+      assert_equal db.search("ナポリタン", :order => :asc)[1], 2
+      assert_equal db.search("ナポリタン", :order => :asc)[2], 3
+      assert_equal db.search("ナポリタン", :order => :desc).size, 3
+      assert_equal db.search("ナポリタン", :order => :desc)[0], 3
+      assert_equal db.search("ナポリタン", :order => :desc)[1], 2
+      assert_equal db.search("ナポリタン", :order => :desc)[2], 1
+
+      assert_equal db.search("ナポリタン", :range => {:gt => Date.new(2014, 1, 2)}).size, 1
+      assert_equal db.search("ナポリタン", :range => {:gt => Date.new(2014, 1, 2)})[0], 3
+      assert_equal db.search("ナポリタン", :range => {:lt => Date.new(2014, 1, 2)}).size, 1
+      assert_equal db.search("ナポリタン", :range => {:lt => Date.new(2014, 1, 2)})[0], 1
+      assert_equal db.search("ナポリタン", :range => {:gte => Date.new(2014, 1, 2)}).size, 2
+      assert_equal db.search("ナポリタン", :order => :asc, :range => {:gte => Date.new(2014, 1, 2)})[0], 2
+      assert_equal db.search("ナポリタン", :order => :asc, :range => {:gte => Date.new(2014, 1, 2)})[1], 3
+      assert_equal db.search("ナポリタン", :range => {:lte => Date.new(2014, 1, 2)}).size, 2
+      assert_equal db.search("ナポリタン", :order => :asc, :range => {:lte => Date.new(2014, 1, 2)})[0], 1
+      assert_equal db.search("ナポリタン", :order => :asc, :range => {:lte => Date.new(2014, 1, 2)})[1], 2
+      
+      assert_equal db.search("ナポリタン", :range => {:gte => Date.new(2014, 1, 2), :lt => Date.new(2014, 1, 3)}).size, 1
+      assert_equal db.search("ナポリタン", :range => {:gte => Date.new(2014, 1, 2), :lt => Date.new(2014, 1, 3)})[0], 2
+    end
+  end
   def test_create
     db = FtsLite::Index.open(DB_FILE)
     db.drop_table!

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fts_lite
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - nagadomi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bimyou_segmenter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -64,27 +59,26 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/nagadomi/fts_lite
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: simple full text search engine
 test_files:
 - test/fts_lite_test.rb