xapit 0.2.3 → 0.2.4

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.2.4* (June 23rd, 2009)
+
+* only create/update record in index if it matches xapit find conditions
+
+
 *0.2.3* (June 18th, 2009)
 
 * adding compatability with Xapit Sync

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('xapit', '0.2.3') do |p|
+Echoe.new('xapit', '0.2.4') do |p|
   p.summary        = "Ruby library for interacting with Xapian, a full text search engine."
   p.description    = "Ruby library for interacting with Xapian, a full text search engine."
   p.url            = "http://github.com/ryanb/xapit"

data/lib/xapit/adapters/abstract_adapter.rb

@@ -27,7 +27,8 @@ module Xapit
     end
     
     # Fetch a single record by the given id.
-    def find_single(id)
+    # The args are the same as those passed from the XapitMember#xapit call.
+    def find_single(id, *args)
       raise "To be implemented in subclass"
     end
     

data/lib/xapit/adapters/active_record_adapter.rb

@@ -5,8 +5,8 @@ module Xapit
       member_class.ancestors.map(&:to_s).include? "ActiveRecord::Base"
     end
     
-    def find_single(id)
-      @target.find(id)
+    def find_single(id, *args)
+      @target.find_by_id(id, *args)
     end
     
     def find_multiple(ids)

data/lib/xapit/index_blueprint.rb

@@ -93,17 +93,24 @@ module Xapit
       index + facets.size + sortable_attributes.size
     end
     
-    # Add a single record to the index
+    # Add a single record to the index if it matches the xapit options.
     def create_record(member_id)
-      @indexer.add_member(@member_class.xapit_adapter.find_single(member_id))
+      member = @member_class.xapit_adapter.find_single(member_id, *@args)
+      @indexer.add_member(member) if member
     end
     
-    # Update a single record in the index
+    # Update a single record in the index. If the record does not match the xapit
+    # conditions then it is removed from the index instead.
     def update_record(member_id)
-      @indexer.update_member(@member_class.xapit_adapter.find_single(member_id))
+      member = @member_class.xapit_adapter.find_single(member_id, *@args)
+      if member
+        @indexer.update_member(member)
+      else
+        destroy_record(member_id)
+      end
     end
     
-    # Remove a single record from the index
+    # Remove a single record from the index.
     def destroy_record(member_id)
       Xapit::Config.writable_database.delete_document("Q#{@member_class}-#{member_id}")
     end

data/spec/xapit/adapters/active_record_adapter_spec.rb

@@ -10,9 +10,9 @@ describe Xapit::ActiveRecordAdapter do
   
   it "should pass find_single to find method to target" do
     target = Object.new
-    mock(target).find(1) { :record }
+    mock(target).find_by_id(1, :conditions => "foo") { :record }
     adapter = Xapit::ActiveRecordAdapter.new(target)
-    adapter.find_single(1).should == :record
+    adapter.find_single(1, :conditions => "foo").should == :record
   end
   
   it "should pass find_multiple to find method to target" do

data/spec/xapit/index_blueprint_spec.rb

@@ -81,20 +81,32 @@ describe Xapit::IndexBlueprint do
     XapitMember.search("Bad Record").should == []
   end
   
-  it "should remove a record from the index" do
-    member = XapitMember.new(:name => "Bad Record!")
+  it "should update a record in the index" do
+    member = XapitMember.new(:name => "New Record!")
     @index.text :name
     @index.index_all
-    @index.destroy_record(member.id)
-    XapitMember.search("Bad Record").should == []
+    member.update_attribute(:name, "Changed Record!")
+    @index.update_record(member.id)
+    XapitMember.search("Changed Record").should == [member]
   end
   
-  it "should update a record in the index" do
+  it "should not create record index if member isn't found" do
+    Xapit::Config.writable_database # make sure the database is built
+    member = XapitMember.new(:name => "New Record!")
+    stub(XapitMember).find { nil }
+    @index.text :name
+    @index.create_record(member.id)
+    XapitMember.search("New Record").should be_empty
+  end
+  
+  it "should remove record from index when updating a member which doesn't exist" do
     member = XapitMember.new(:name => "New Record!")
     @index.text :name
     @index.index_all
+    stub(XapitMember).find { nil }
     member.update_attribute(:name, "Changed Record!")
     @index.update_record(member.id)
-    XapitMember.search("Changed Record").should == [member]
+    XapitMember.search("New Record").should be_empty
+    XapitMember.search("Changed Record").should be_empty
   end
 end

data/spec/xapit_member.rb

@@ -26,6 +26,10 @@ class XapitMember
     end
   end
   
+  def self.find_by_id(id)
+    find(id)
+  end
+  
   def initialize(attributes = {})
     @@records ||= []
     @id = @@records.size + 1

data/xapit.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xapit}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Bates"]
-  s.date = %q{2009-06-18}
+  s.date = %q{2009-06-23}
   s.description = %q{Ruby library for interacting with Xapian, a full text search engine.}
   s.email = %q{ryan (at) railscasts (dot) com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/xapit/adapters/abstract_adapter.rb", "lib/xapit/adapters/active_record_adapter.rb", "lib/xapit/adapters/data_mapper_adapter.rb", "lib/xapit/collection.rb", "lib/xapit/config.rb", "lib/xapit/facet.rb", "lib/xapit/facet_blueprint.rb", "lib/xapit/facet_option.rb", "lib/xapit/index_blueprint.rb", "lib/xapit/indexers/abstract_indexer.rb", "lib/xapit/indexers/classic_indexer.rb", "lib/xapit/indexers/simple_indexer.rb", "lib/xapit/membership.rb", "lib/xapit/query.rb", "lib/xapit/query_parsers/abstract_query_parser.rb", "lib/xapit/query_parsers/classic_query_parser.rb", "lib/xapit/query_parsers/simple_query_parser.rb", "lib/xapit/rake_tasks.rb", "lib/xapit.rb", "LICENSE", "README.rdoc", "tasks/spec.rb", "tasks/xapit.rake", "TODO"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xapit
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Ryan Bates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: []