supernova 0.4.13 → 0.4.14

data/README.rdoc

@@ -2,7 +2,27 @@
 
 == Setup
 
-  will come back soon!
+=== Define Solr Index
+
+  class LocationIndex < Supernova::SolrIndexer
+    has :title,     :type => :text
+    has :location,  :type => :string
+    
+    clazz Location
+    
+    # is called before hash is added to index (with original database row)
+    # only called when defined
+    def before_index(row)
+      row.merge(:indexed_b => true)
+    end
+    
+    # is called with a made up record of class defined with "clazz Location" and
+    # should return a hash which is merged into the original hash
+    # only called when method defined and clazz set
+    def extra_attributes_from_record(record)
+      { :normalized_title_s => record.normalized_title }
+    end
+  end
 
 === Anonymous Scopes
 
@@ -36,7 +56,7 @@
   Offer.search_scope.near(47.0, 11.0).within(100.meters)
   Offer.search_scope.near(other_offer).within(100.meters)
 
-== Contributing to search_scopes
+== Contributing to supernova
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it

data/VERSION

@@ -1 +1 @@
-0.4.13
+0.4.14

data/bin/start_solr

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
 
-exec %(cd /usr/local/Cellar/solr/3.1.0/libexec/example && java -Dsolr.solr.home=#{File.expand_path("../solr", File.dirname(__FILE__))} -Djetty.port=8985 -jar start.jar)
+solr_home = File.expand_path("../solr", File.dirname(__FILE__))
+cmd = %(cd /usr/local/Cellar/solr/3.1.0/libexec/example && java -Dsolr.solr.home=#{solr_home} -Djetty.port=8985 -jar start.jar > #{solr_home}/solr.log 2>&1 &)
+exec cmd

data/lib/supernova/solr_indexer.rb

@@ -71,9 +71,7 @@ class Supernova::SolrIndexer
   end
   
   def index!
-    index_query(query_to_index) do |row|
-      map_for_solr(row)
-    end
+    index_query(query_to_index)
   end
   
   def map_for_solr(row)
@@ -97,7 +95,8 @@ class Supernova::SolrIndexer
     hash["indexed_at_dt"] = Time.now.utc.iso8601
     hash["id_s"] = [self.class.table_name, hash["id"]].compact.join("/") if hash["id"]
     self.class.field_definitions.each do |field, options|
-      if value = hash.delete(field.to_s)
+      if hash.has_key?(field.to_s)
+        value = hash.delete(field.to_s)
         if options[:type] == :date 
           value = Time.utc(value.year, value.month, value.day) if value.is_a?(Date)
           value = value.utc.iso8601 
@@ -175,18 +174,23 @@ class Supernova::SolrIndexer
     db.send(db.respond_to?(:query) ? :query : :select_all, query)
   end
   
-  def index_query(query, &block)
-    rows = query_db(query)
+  def solr_rows_to_index_for_query(query)
+    query_db(query).map do |row|
+      map_for_solr(row)
+    end
+  end
+  
+  def index_query(query)
+    rows = solr_rows_to_index_for_query(query)
     if self.max_rows_to_direct_index < rows.count
-      index_with_json_file(rows, &block)
+      index_with_json_file(rows)
     else
-      index_directly(rows, &block)
+      index_directly(rows)
     end
   end
   
   def index_directly(rows, &block)
     rows.each do |row|
-      row = yield(row) if block_given?
       row = Supernova::Solr.connection.add(row)
     end
     Supernova::Solr.connection.commit if rows.any?
@@ -194,7 +198,6 @@ class Supernova::SolrIndexer
   
   def index_with_json_file(rows, &block)
     rows.each do |row|
-      row = yield(row) if block_given?
       write_to_file(row)
     end
     finish

data/spec/supernova/solr_indexer_spec.rb

@@ -25,6 +25,7 @@ describe Supernova::SolrIndexer do
     indexer_clazz.has(:artist_id, :type => :integer)
     indexer_clazz.has(:description, :type => :text)
     indexer_clazz.has(:created_at, :type => :date)
+    indexer_clazz.has(:indexed, :type => :boolean, :virtual => true)
   end
   
   before(:each) do
@@ -69,16 +70,6 @@ describe Supernova::SolrIndexer do
       indexer.should_receive(:index_query).with(query)
       indexer.index!
     end
-    
-    it "calls map_for_solr with all returned rows from sql" do
-      row1 = double("row1")
-      row2 = double("row2")
-      indexer.stub!(:query).and_return [row1, row2]
-      indexer.stub!(:query_to_index).and_return "some query"
-      indexer.should_receive(:map_for_solr).with(row1)
-      indexer.stub!(:index_query).and_yield(row1)
-      indexer.index!
-    end
   end
   
   describe "#map_for_solr" do
@@ -211,6 +202,15 @@ describe Supernova::SolrIndexer do
       has :lng, :type => :float
       has :created_at, :type => :date
       has :checkin_date, :type => :date
+      has :indexed, :type => :boolean, :virtual => true
+    end
+    
+    it "maps virtual fields" do
+      CustomSolrIndex.new.map_hash_keys_to_solr("indexed" => true)["indexed_b"].should == true
+    end
+    
+    it "maps fields with false as value" do
+      CustomSolrIndex.new.map_hash_keys_to_solr("indexed" => false)["indexed_b"].should == false
     end
     
     it "maps float fields" do
@@ -254,9 +254,37 @@ describe Supernova::SolrIndexer do
     end
   end
   
+  describe "#solr_rows_to_index_for_query" do
+    let(:result) {
+      [
+        { "title" => "Some Title", "artist_id" => 10 }
+      ]
+    }
+    
+    { "title_t" => "Some Title", "artist_id_i" => 10 }.each do |key, value|
+      it "sets #{key} to #{value}" do
+        custom_indexer.should_receive(:query_db).with("some query").and_return(result)
+        custom_indexer.solr_rows_to_index_for_query("some query").first[key].should == value
+      end
+    end
+    
+    it "also maps virtual attributes" do
+      hash = { "indexed" => true }
+      query = "some query"
+      custom_indexer.should_receive(:query_db).with(query).and_return([hash])
+      custom_indexer.solr_rows_to_index_for_query(query).first["indexed_b"].should == true
+    end
+  end
+  
   describe "#index_query" do
     let(:query) { %(SELECT CONCAT("user_", id) AS id, title FROM people WHERE type = 'User') }
     
+    it "calls solr_rows_to_index_for_query with query" do
+      result = []
+      indexer.should_receive(:solr_rows_to_index_for_query).with(query).and_return(result)
+      indexer.index_query(query)
+    end
+    
     it "calls index_with_json_file when rows > max_rows_to_direct_index" do
       indexer.max_rows_to_direct_index = 0
       rows = [to_index]
@@ -289,7 +317,7 @@ describe Supernova::SolrIndexer do
       end
 
       it "calls write_to_file on all rows" do
-        rows = [double("1"), double("2")]
+        rows = [{ "b" => 2 }, { "a" => 1 }]
         indexer.stub(:query_db).and_return rows
         indexer.should_receive(:write_to_file).with(rows.first)
         indexer.should_receive(:write_to_file).with(rows.at(1))
@@ -327,8 +355,6 @@ describe Supernova::SolrIndexer do
       solr.should_not_receive(:commit)
       indexer.index_directly([])
     end
-    
-    it "calls a block given given"
   end
   
   describe "#index_file_path" do
@@ -625,7 +651,8 @@ describe Supernova::SolrIndexer do
     
     it "adds the attribute_mapping" do
       indexer_clazz.where(:a => 1).search_options[:attribute_mapping].should == {
-        :artist_id=>{:type=>:integer}, :title=>{:type=>:text}, :created_at=>{:type=>:date}, :description=>{:type=>:text}
+        :artist_id=>{:type=>:integer}, :title=>{:type=>:text}, :created_at=>{:type=>:date}, :description=>{:type=>:text},
+        :indexed => {:type => :boolean, :virtual => true } 
       }
     end
   end
@@ -636,7 +663,8 @@ describe Supernova::SolrIndexer do
         where(:public => true)
       end
       indexer_clazz.published.search_options[:attribute_mapping].should == {
-        :artist_id=>{:type=>:integer}, :title=>{:type=>:text}, :created_at=>{:type=>:date}, :description=>{:type=>:text}
+        :artist_id=>{:type=>:integer}, :title=>{:type=>:text}, :created_at=>{:type=>:date}, :description=>{:type=>:text}, 
+        :indexed => {:type => :boolean, :virtual => true } 
       }
     end
     

data/supernova.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.4.13"
+  s.version = "0.4.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-07-18}
+  s.date = %q{2011-07-27}
   s.description = %q{Unified search scopes}
   s.email = %q{tobias.schwab@dynport.de}
   s.executables = ["start_solr"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 4
-  - 13
-  version: 0.4.13
+  - 14
+  version: 0.4.14
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 Z
+date: 2011-07-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement