oss_active_record 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8d98241b53d0f1f9dc6ee4dcb51ea5fa60f4aca
-  data.tar.gz: 8284c8abaa036e7ee4c80b5ca3b808b540f15320
+  metadata.gz: 2f8e8e1561d5a73a94cdddbf76c5c759a7a3fa5f
+  data.tar.gz: 310cc970b75e8cc6a11b11324e29ca177ac964dc
 SHA512:
-  metadata.gz: 451d6b0de1db3f12699cba08c5fa1c4e5cdf16bc456c5cf35abb64172dfa327ac5e97ae22e4d4b339a095db22e6a9fd14bb5fd9dbd9ec0f7cdc2865ee6b96bf0
-  data.tar.gz: 2cdb7d185b3fdea92cb2b56fcda65241f5e092505a79fae9e8d9f0e5112f443d92ce260ce68dfc4331a7e2c49d9f379c8e3432c1ac11b99f34f1fcfcdf32b640
+  metadata.gz: 52842be27da1d798c3a4da10630de1334a969441b8ca65fd891ace53b0a1d9fc9e22327c2fce62007d36053cd666a418ab97ea754ae3776499fcb5d649a50bac
+  data.tar.gz: 3a90938372e32b123bd86481d5dcd60402106a4b6159f4aa8ba7eb9ce72b32bc6971c8d6bba9f56f67c188b24a022b5b993cc249785f312f3b87d820d4bbb35f

data/lib/oss_active_record/search_request.rb

@@ -1,12 +1,10 @@
 module OssActiveRecord
   class SearchRequest
-    def initialize(index, text_fields, sortable_fields)
-      @index = index
+    def initialize(searchable)
       @params = {'start' => 0,  'rows' => 10}
-      @filters = [];
-      @text_fields = text_fields;
-      @sortable_fields = sortable_fields;
-      @order_by = {};
+      @filters = []
+      @searchable = searchable
+      @order_by = {}
     end
 
     def fulltext(keywords, &block)
@@ -14,15 +12,17 @@ module OssActiveRecord
     end
 
     def filter(field, value, negative)
-      @filters << {"type"=> "QueryFilter",  "negative"=> negative,  "query"=> "#{field}:#{value}"}
+      @filters << {"type"=> "QueryFilter",  "negative"=> negative,  "query"=> "#{field}:(#{value})"}
     end
 
     def with(field, value)
-      filter field, value, false
+      index_field = @searchable.find_field_name(field)
+      filter index_field, value, false unless index_field.nil?
     end
 
     def without(field, value)
-      filter field, value, true
+      index_field = @searchable.find_field_name(field)
+      filter index_field, value, true unless index_field.nil?
     end
 
     def returns(fields)
@@ -37,15 +37,15 @@ module OssActiveRecord
     end
 
     def order_by(field = nil, direction = :asc)
-      field = field == :score ? 'score' :@sortable_fields[field]
-      @order_by[field.to_s] = direction.to_s.upcase unless field.nil?
+      index_field = field == :score ? 'score' :@searchable.find_sortable_name(field)
+      @order_by[index_field] = direction.to_s.upcase unless index_field.nil?
     end
 
     def execute(&block)
       self.instance_eval(&block) unless block.nil?
       @params['filters'] = @filters unless @filters.length == 0
       fields = []
-      @text_fields.each do |key, value|
+      @searchable._text_fields.each do |key, value|
         fields<<{ "field"=> value,"phrase"=> true,"boost"=> 1.0}
       end
       @params['searchFields'] = fields unless fields.length == 0
@@ -54,7 +54,7 @@ module OssActiveRecord
         sorts<<{ "field"=> key,"direction"=> value}
       end
       @params['sorts'] = sorts unless sorts.length == 0
-      return @index.search_field(@params)
+      return @searchable.oss_index.search_field(@params)
     end
 
   end

data/lib/oss_active_record/searchable.rb

@@ -17,12 +17,25 @@ module OssActiveRecord
       @@_field_id = nil
       @@_text_fields = {}
       @@_sortable_fields = {}
+      @@_all_fields = {}
       @@index = nil
 
+      def _text_fields
+        @@_text_fields
+      end
+
       def _fields
         @@_fields
       end
 
+      def find_sortable_name(field_name)
+        field == :score ? 'score' : @@_sortable_fields[field_name] unless field_name.nil?
+      end
+
+      def find_field_name(field_name)
+        @@_all_fields[field_name] unless field_name.nil?
+      end
+
       def searchable(options = {}, &block)
         yield
         unless options[:auto_index] == false
@@ -33,7 +46,10 @@ module OssActiveRecord
       def oss_index
         if @@index.nil?
           @@index_name ||= self.name.downcase
-          @@index = Oss::Index.new(@@index_name, Rails.configuration.open_search_server_url)
+          @@index = Oss::Index.new(@@index_name,
+          Rails.configuration.open_search_server_url,
+          Rails.configuration.open_search_server_login,
+          Rails.configuration.open_search_server_apikey)
           create_schema!
         end
         @@index
@@ -63,7 +79,10 @@ module OssActiveRecord
       end
 
       def create_schema_field!(field)
-        analyzers = { :text => 'StandardAnalyzer',  :integer => 'DecimalAnalyzer'}
+        analyzers = {
+          :text => 'StandardAnalyzer',
+          :integer => 'IntegerAnalyzer',
+          :decimal => 'DecimalAnalyzer'}
         analyzer = analyzers[field[:type]] if field[:name] != :id
         termVectors = { :text => 'POSITIONS_OFFSETS'}
         termVector = termVectors[field[:type]] || 'NO'
@@ -77,34 +96,31 @@ module OssActiveRecord
         }
         @@_text_fields[field[:name]] = name if field[:type] == :text
         @@_sortable_fields[field[:name]] = name unless field[:type] == :text
+        @@_all_fields[field[:name]] = name
         self.oss_index.set_field(params)
         self.oss_index.set_field_default_unique(name, name) if field[:name] == :id
       end
 
       def method_missing(method, *args, &block)
-        yield unless block.nil?
         add_field args[0], method, block if @@field_types.include? method
       end
 
       def search(*args, &block)
-        searchRequest = SearchRequest.new(self.oss_index, @@_text_fields, @@_sortable_fields)
+        searchRequest = SearchRequest.new(self)
         searchRequest.returns @@_fields.map {|f|"#{f[:name]}|#{f[:type]}"}
-        active_record_from_result searchRequest.execute(&block)
+        find_results searchRequest.execute(&block)
       end
 
-      def get_ids_from_results(search_result)
-        ids = []
+      def find_results(search_result)
         id_field_name = "#{@@_field_id[:name]}|#{@@_field_id[:type]}"
+        results = []
         search_result['documents'].each do |document|
           document['fields'].each do |field|
-            ids << field['values'].map {|f|f.to_i}.uniq if field['fieldName'] == id_field_name
+            id = field['values'].map {|f|f.to_i}.uniq if field['fieldName'] == id_field_name
+            results<<find(id)[0] unless id.nil?
           end
         end
-        return ids
-      end
-
-      def active_record_from_result(search_result)
-        find get_ids_from_results(search_result)
+        return results
       end
 
     end

data/lib/oss_active_record/version.rb

@@ -1,3 +1,3 @@
 module OssActiveRecord
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/dummy/app/models/article.rb

@@ -5,6 +5,7 @@ class Article < ActiveRecord::Base
     text     :title              # fulltext
     string   :title              # order_by
     text     :content            #fulltext
+    integer  :category_id
     time     :updated_at
   end
 

data/test/dummy/app/models/document.rb

@@ -27,7 +27,8 @@ class Folder
 end
 
 class Document < ActiveRecord::Base
-  #  belongs_to :current_revision
+
+  belongs_to :current_revision
   def self.folder
     Folder.new
   end

data/test/dummy/config/initializers/oss_active_record.rb

@@ -1 +1,3 @@
 Rails.configuration.open_search_server_url = "http://localhost:8080"
+Rails.configuration.open_search_server_login = nil
+Rails.configuration.open_search_server_apikey = nil

data/test/dummy/db/migrate/20130901161100_create_articles.rb

@@ -3,6 +3,7 @@ class CreateArticles < ActiveRecord::Migration
     create_table :articles do |t|
       t.string :title
       t.string :content
+      t.integer :category_id
       t.time :updated_at
       t.timestamps
     end

data/test/dummy/db/schema.rb

@@ -16,6 +16,7 @@ ActiveRecord::Schema.define(version: 20130901161100) do
   create_table "articles", force: true do |t|
     t.string   "title"
     t.string   "content"
+    t.integer  "category_id"
     t.datetime "updated_at"
     t.datetime "created_at"
   end

data/test/dummy/log/development.log

@@ -150,3 +150,69 @@ Migrating to CreateArticles (20130901161100)
   SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20130901161100"]]
    (1.1ms)  commit transaction
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.4ms)  CREATE TABLE "articles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "content" varchar(255), "category_id" integer, "updated_at" datetime, "created_at" datetime) 
+   (1.3ms)  CREATE TABLE "documents" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "folder_id" integer, "room_id" integer, "name" varchar(255), "updated_at" datetime, "uuid" integer, "user_id" integer, "file_size" integer, "file_content_type" varchar(255), "state" varchar(255), "created_at" datetime) 
+   (1.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130901161100')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130711150619')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.3ms)  CREATE TABLE "articles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "content" varchar(255), "updated_at" datetime, "created_at" datetime) 
+   (1.0ms)  CREATE TABLE "documents" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "folder_id" integer, "room_id" integer, "name" varchar(255), "updated_at" datetime, "uuid" integer, "user_id" integer, "file_size" integer, "file_content_type" varchar(255), "state" varchar(255), "created_at" datetime) 
+   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130901161100')
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130711150619')
+   (1.3ms)  CREATE TABLE "articles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "content" varchar(255), "updated_at" datetime, "created_at" datetime) 
+   (1.2ms)  CREATE TABLE "documents" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "folder_id" integer, "room_id" integer, "name" varchar(255), "updated_at" datetime, "uuid" integer, "user_id" integer, "file_size" integer, "file_content_type" varchar(255), "state" varchar(255), "created_at" datetime) 
+   (0.9ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130901161100')
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130711150619')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.2ms)  CREATE TABLE "articles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "content" varchar(255), "updated_at" datetime, "created_at" datetime) 
+   (0.9ms)  CREATE TABLE "documents" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "folder_id" integer, "room_id" integer, "name" varchar(255), "updated_at" datetime, "uuid" integer, "user_id" integer, "file_size" integer, "file_content_type" varchar(255), "state" varchar(255), "created_at" datetime) 
+   (1.6ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130901161100')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130711150619')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.1ms)  CREATE TABLE "articles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "content" varchar(255), "updated_at" datetime, "created_at" datetime) 
+   (1.2ms)  CREATE TABLE "documents" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "folder_id" integer, "room_id" integer, "name" varchar(255), "updated_at" datetime, "uuid" integer, "user_id" integer, "file_size" integer, "file_content_type" varchar(255), "state" varchar(255), "created_at" datetime) 
+   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.9ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130901161100')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130711150619')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.5ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateDocuments (20130711150619)
+   (0.1ms)  begin transaction
+   (0.5ms)  CREATE TABLE "documents" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "folder_id" integer, "room_id" integer, "name" varchar(255), "updated_at" datetime, "uuid" integer, "user_id" integer, "file_size" integer, "file_content_type" varchar(255), "state" varchar(255), "created_at" datetime) 
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20130711150619"]]
+   (0.8ms)  commit transaction
+Migrating to CreateArticles (20130901161100)
+   (0.1ms)  begin transaction
+   (0.5ms)  CREATE TABLE "articles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "content" varchar(255), "category_id" integer, "updated_at" datetime, "created_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20130901161100"]]
+   (1.3ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.7ms)  CREATE TABLE "articles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "content" varchar(255), "category_id" integer, "updated_at" datetime, "created_at" datetime) 
+   (1.4ms)  CREATE TABLE "documents" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "folder_id" integer, "room_id" integer, "name" varchar(255), "updated_at" datetime, "uuid" integer, "user_id" integer, "file_size" integer, "file_content_type" varchar(255), "state" varchar(255), "created_at" datetime) 
+   (1.0ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130901161100')
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130711150619')