xapit 0.2.2 → 0.2.3

data/CHANGELOG

@@ -1,3 +1,12 @@
+*0.2.3* (June 18th, 2009)
+
+* adding compatability with Xapit Sync
+
+* adding create/update/destroy record methods for modifying a single record in index
+
+* allow ranges to be specified in conditions array
+
+
 *0.2.2* (June 16th, 2009)
 
 * performance improvements

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('xapit', '0.2.2') do |p|
+Echoe.new('xapit', '0.2.3') 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/index_blueprint.rb

@@ -79,18 +79,35 @@ module Xapit
       end
     end
     
+    # The Xapian value index position of a sortable attribute
     def position_of_sortable(sortable_attribute)
       index = sortable_attributes.map(&:to_s).index(sortable_attribute.to_s)
       raise "Unable to find indexed sortable attribute \"#{sortable_attribute}\" in #{@member_class} sortable attributes: #{sortable_attributes.inspect}" if index.nil?
       index + facets.size
     end
     
+    # The Xapian value index position of a field attribute
     def position_of_field(field_attribute)
       index = field_attributes.map(&:to_s).index(field_attribute.to_s)
       raise "Unable to find indexed field attribute \"#{field_attribute}\" in #{@member_class} field attributes: #{field_attributes.inspect}" if index.nil?
       index + facets.size + sortable_attributes.size
     end
     
+    # Add a single record to the index
+    def create_record(member_id)
+      @indexer.add_member(@member_class.xapit_adapter.find_single(member_id))
+    end
+    
+    # Update a single record in the index
+    def update_record(member_id)
+      @indexer.update_member(@member_class.xapit_adapter.find_single(member_id))
+    end
+    
+    # Remove a single record from the index
+    def destroy_record(member_id)
+      Xapit::Config.writable_database.delete_document("Q#{@member_class}-#{member_id}")
+    end
+    
     private
     
     # Make sure all models are loaded - without reloading any that

data/lib/xapit/indexers/abstract_indexer.rb

@@ -8,6 +8,10 @@ module Xapit
       database.add_document(document_for(member))
     end
     
+    def update_member(member)
+      database.replace_document("Q#{member.class}-#{member.id}", document_for(member))
+    end
+    
     def document_for(member)
       document = Xapian::Document.new
       document.data = "#{member.class}-#{member.id}"

data/lib/xapit/membership.rb

@@ -47,6 +47,7 @@ module Xapit
         @xapit_index_blueprint = IndexBlueprint.new(self, *args)
         yield(@xapit_index_blueprint)
         include AdditionalMethods
+        include XapitSync::Membership if defined? XapitSync
       end
     end
     

data/lib/xapit/query_parsers/abstract_query_parser.rb

@@ -113,9 +113,6 @@ module Xapit
         conditions.map do |name, value|
           if value.kind_of? Array
             Query.new(value.map { |v| condition_term(name, v) }, :or)
-          elsif value.kind_of?(Range) && @member_class
-            position = @member_class.xapit_index_blueprint.position_of_field(name)
-            Xapian::Query.new(Xapian::Query::OP_VALUE_RANGE, position, Xapit.serialize_value(value.begin), Xapit.serialize_value(value.end))
           else
             condition_term(name, value)
           end
@@ -126,12 +123,17 @@ module Xapit
     end
     
     def condition_term(name, value)
-      if value.kind_of? Time
-        value = value.to_i
-      elsif value.kind_of? Date
-        value = value.to_time.to_i
+      if value.kind_of?(Range) && @member_class
+        position = @member_class.xapit_index_blueprint.position_of_field(name)
+        Xapian::Query.new(Xapian::Query::OP_VALUE_RANGE, position, Xapit.serialize_value(value.begin), Xapit.serialize_value(value.end))
+      else
+        if value.kind_of? Time
+          value = value.to_i
+        elsif value.kind_of? Date
+          value = value.to_time.to_i
+        end
+        "X#{name}-#{value.to_s.downcase}"
       end
-      "X#{name}-#{value.to_s.downcase}"
     end
   end
 end

data/spec/xapit/index_blueprint_spec.rb

@@ -65,4 +65,36 @@ describe Xapit::IndexBlueprint do
     mock(XapitMember).find_each(:foo, :bar => :blah)
     index.index_all
   end
+  
+  it "should add a record from the index" do
+    member = XapitMember.new(:name => "New Record!")
+    @index.text :name
+    @index.create_record(member.id)
+    XapitMember.search("New Record").should == [member]
+  end
+  
+  it "should remove a record from the index" do
+    member = XapitMember.new(:name => "Bad Record!")
+    @index.text :name
+    @index.index_all
+    @index.destroy_record(member.id)
+    XapitMember.search("Bad Record").should == []
+  end
+  
+  it "should remove a record from the index" do
+    member = XapitMember.new(:name => "Bad Record!")
+    @index.text :name
+    @index.index_all
+    @index.destroy_record(member.id)
+    XapitMember.search("Bad Record").should == []
+  end
+  
+  it "should update a record in the index" do
+    member = XapitMember.new(:name => "New Record!")
+    @index.text :name
+    @index.index_all
+    member.update_attribute(:name, "Changed Record!")
+    @index.update_record(member.id)
+    XapitMember.search("Changed Record").should == [member]
+  end
 end

data/spec/xapit/query_parsers/abstract_query_parser_spec.rb

@@ -38,4 +38,14 @@ describe Xapit::AbstractQueryParser do
     parser = Xapit::AbstractQueryParser.new(XapitMember, :conditions => { :foo => 2..5 })
     parser.condition_terms.first.description.should == expected.description
   end
+    
+  it "should allow range condition to be specified in array." do
+    XapitMember.xapit { |i| i.field :foo }
+    expected = Xapian::Query.new(Xapian::Query::OP_OR,
+      Xapian::Query.new(Xapian::Query::OP_VALUE_RANGE, 0, Xapian.sortable_serialise(2), Xapian.sortable_serialise(5)),
+      Xapian::Query.new(Xapian::Query::OP_AND, ["Xfoo-10"])
+    )
+    parser = Xapit::AbstractQueryParser.new(XapitMember, :conditions => { :foo => [2..5, 10] })
+    parser.condition_terms.first.xapian_query.description.should == expected.description
+  end
 end

data/spec/xapit_member.rb

@@ -40,4 +40,8 @@ class XapitMember
       super
     end
   end
+  
+  def update_attribute(name, value)
+    @attributes[name] = value
+  end
 end

data/xapit.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xapit}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   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-16}
+  s.date = %q{2009-06-18}
   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.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Ryan Bates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-16 00:00:00 -07:00
+date: 2009-06-18 00:00:00 -07:00
 default_executable: 
 dependencies: []