activesearch 0.0.3 → 0.0.4

data/spec/engines_spec.rb

@@ -0,0 +1,54 @@
+#encoding: utf-8
+
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+def cleanup(engine)
+  case engine
+  when "ElasticSearch"
+    Tire::Configuration.client.delete "#{Tire::Configuration.url}/_all"
+    load File.join(File.dirname(__FILE__), 'models', 'elastic_search.rb')
+  when "Mongoid"
+    Mongoid.master.collections.select { |c| c.name != 'system.indexes' }.each(&:drop)
+  end
+end
+
+Dir[File.join(File.dirname(__FILE__), 'models', '*.rb')].map { |f| File.basename(f, '.rb') }.each do |filename|
+  engine = filename.split('_').collect { |w| w.capitalize }.join
+  
+  describe "ActiveSearch::#{engine}" do
+    before(:all) do
+      require File.join(File.dirname(__FILE__), 'models', filename)
+    end
+    
+    before do
+      cleanup(engine)
+      @findable       = Object.const_get("#{engine}Model").create(title: "Findable Findable", junk: "Junk field")
+      @quite_findable = Object.const_get("#{engine}Model").create(title: "Some title", text: "Findable text")
+      @another        = Object.const_get("Another#{engine}Model").create(title: "Another findable title")
+      @junk           = Object.const_get("#{engine}Model").create(title: "Junk", junk: "Not Findable junk")
+    end
+    
+    it "should find the expected documents" do
+      results = ActiveSearch.search("findable").map { |doc| doc.to_hash.select { |k,v| %w[title junk].include?(k.to_s) } }
+      results.sort_by { |result| result["title"] }.should == [
+          {
+            "title"  => "Another findable title"
+          },
+          {
+            "title"  => "Findable Findable",
+            "junk"   => "Junk field"
+          },
+          {
+            "title"  => "Some title"
+          },
+        ]
+      ActiveSearch.search("some text").first.to_hash["title"].should == "Some title"
+      ActiveSearch.search("junk").first.to_hash["title"].should == "Junk"
+    end
+
+    it "should remove destroyed documents from index" do
+      @findable.destroy
+      ActiveSearch.search("findable").count.should == 2
+    end
+  end
+end

data/spec/models/elastic_search.rb

@@ -0,0 +1,35 @@
+require 'tire'
+require 'activesearch/elastic_search'
+
+Tire.configure { logger File.join(File.dirname(__FILE__), '..', '..', 'log', 'elasticsearch.log'), :level => 'debug' }
+
+module ElasticSearchRefresh
+  
+  def save
+    super.tap { tire.index.refresh }
+  end
+  
+  def destroy
+    super.tap { tire.index.refresh; sleep(1) }
+  end
+end
+
+class ElasticSearchModel < ActiveMimic
+  include ActiveSearch::ElasticSearch
+  include ElasticSearchRefresh
+  
+  attribute :title
+  attribute :text
+  attribute :junk
+  
+  search_by :title, :text, store: [:title, :junk]
+
+end
+
+class AnotherElasticSearchModel < ActiveMimic
+  include ActiveSearch::ElasticSearch
+  include ElasticSearchRefresh
+  
+  attribute :title, type: String
+  search_by :title, store: [:title]
+end

data/spec/models/mongoid.rb

@@ -0,0 +1,31 @@
+require 'mongoid'
+require 'activesearch/mongoid'
+
+Mongoid.database = Mongo::Connection.new("localhost").db("activesearch_test")
+
+class MongoidModel
+  include Mongoid::Document
+  include ActiveSearch::Mongoid
+  
+  field :title, type: String
+  field :text,  type: String
+  field :junk,  type: String
+  search_by :title, :text, store: [:title, :junk]
+end
+
+class AnotherMongoidModel
+  include Mongoid::Document
+  include ActiveSearch::Mongoid
+  
+  field :title, type: String
+  search_by :title, :text, store: [:title]
+end
+
+
+class LocalizedMongoidModel
+  include Mongoid::Document
+  include ActiveSearch::Mongoid
+  
+  field :title, localize: true
+  search_by :title, store: [:title]
+end

data/spec/mongoid_spec.rb

@@ -1,34 +1,16 @@
 #encoding: utf-8
+require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'mongoid'
 require 'activesearch/mongoid'
 
 Mongoid.database = Mongo::Connection.new("localhost").db("activesearch_test")
 
-class MongoidModel
-  include Mongoid::Document
-  include ActiveSearch::Mongoid
-  
-  field :title, type: String
-  field :text,  type: String
-  field :junk,  type: String
-  search_on :title, :text, store: [:title, :junk]
-end
-
-class AnotherMongoidModel
-  include Mongoid::Document
-  include ActiveSearch::Mongoid
-  
-  field :title, type: String
-  search_on :title, :text, store: [:title]
-end
-
-
 class LocalizedMongoidModel
   include Mongoid::Document
   include ActiveSearch::Mongoid
   
   field :title, localize: true
-  search_on :title, store: [:title]
+  search_by :title, store: [:title]
 end
 
 
@@ -36,41 +18,21 @@ describe ActiveSearch::Mongoid do
   before do
     Mongoid.master.collections.select { |c| c.name != 'system.indexes' }.each(&:drop)
     I18n.locale = :en
-    @findable       = MongoidModel.create!(title: "Findable Findable", junk: "Junk field")
-    @quite_findable = MongoidModel.create!(title: "Some title", text: "Findable text")
-    @another        = AnotherMongoidModel.create!(title: "Another findable title")
-    @junk           = MongoidModel.create!(title: "Junk", junk: "Not Findable junk")
-    @localized      = LocalizedMongoidModel.create!(title: "English English")
+    @localized  = LocalizedMongoidModel.create!(title: "English English")
     I18n.with_locale(:es) do
       @localized.title = "Español Español"
-      @localized.save
+      @localized.save!
     end
   end
   
-  it "should find the expected documents" do
-    ActiveSearch.search("findable").map { |r| r.stored["title"] }.should == ["Findable Findable", "Some title", "Another findable title"]
-  end
-  
-  it "should store the proper keywords" do
-    ActiveSearch::Mongoid::Model.where(type: "MongoidModel", original_id: @quite_findable.id).first.keywords.should == %w{some title findable text}
-  end
-  
-  it "should be chainable" do
-    ActiveSearch.search("findable").should respond_to(:where)
-  end
-  
-  it "should store the specified fields" do
-    ActiveSearch::Mongoid::Model.where(type: "MongoidModel", original_id: @findable.id).first.stored.should == {"title" => "Findable Findable", "junk" => "Junk field"}
-  end
-  
   it "should be able to find by different locales" do
-    ActiveSearch.search("english").first.stored["title"]["en"].should == "English English"
+    ActiveSearch.search("english").first._stored["title"]["en"].should == "English English"
     I18n.with_locale(:es) do
-      ActiveSearch.search("español").first.stored["title"]["es"].should == "Español Español"
+      ActiveSearch.search("español").first._stored["title"]["es"].should == "Español Español"
     end
   end
   
   it "should store localized keywords" do
-    ActiveSearch::Mongoid::Model.where(type: "LocalizedMongoidModel", original_id: @localized.id).first.keywords.should == ["en:english", "es:español"]
+    ActiveSearch::Mongoid::Model.where(_original_type: "LocalizedMongoidModel", _original_id: @localized.id).first._keywords.should == ["en:english", "es:español"]
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,31 @@
+require 'active_model'
+require 'active_attr'
+
+class ActiveMimic
+  extend ActiveModel::Callbacks
+  extend ActiveModel::Naming
+  include ActiveModel::Serialization
+  include ActiveAttr::Attributes
+  include ActiveAttr::MassAssignment
+  
+  attribute :id
+  
+  define_model_callbacks :save
+  define_model_callbacks :destroy
+  
+  def self.create(attrs)
+    new(attrs).tap(&:save)
+  end
+  
+  def save
+    run_callbacks :save do
+      true
+    end
+  end
+  
+  def destroy
+    run_callbacks :destroy do
+      true
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activesearch
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: active_attr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +74,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: tire
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel_tests
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ORM agnostic full text search
 email:
 - papipo@gmail.com
@@ -72,12 +120,21 @@ files:
 - README.md
 - Rakefile
 - activesearch.gemspec
+- elasticsearch.log
 - lib/activesearch.rb
+- lib/activesearch/elastic_search.rb
+- lib/activesearch/elastic_search/proxy.rb
 - lib/activesearch/mongoid.rb
 - lib/activesearch/mongoid/model.rb
+- lib/activesearch/result.rb
 - lib/activesearch/version.rb
+- log/elasticsearch.log
 - spec/config/mongoid.yml
+- spec/engines_spec.rb
+- spec/models/elastic_search.rb
+- spec/models/mongoid.rb
 - spec/mongoid_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -105,4 +162,8 @@ summary: ActiveSearch lets you plug in a ruby module in any class that will allo
   you to do full text searches.
 test_files:
 - spec/config/mongoid.yml
+- spec/engines_spec.rb
+- spec/models/elastic_search.rb
+- spec/models/mongoid.rb
 - spec/mongoid_spec.rb
+- spec/spec_helper.rb