supernova 0.3.12 → 0.3.13

data/VERSION

@@ -1 +1 @@
-0.3.12
+0.3.13

data/bin/start_solr

@@ -0,0 +1,3 @@
+#!/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)

data/lib/supernova.rb

@@ -1,4 +1,6 @@
 require "rsolr"
+require "active_support/core_ext/object/blank"
+require "active_support/core_ext/hash"
 
 module Supernova
   KM_TO_METER = 1000.0
@@ -21,6 +23,17 @@ module Supernova
       self.defined_named_search_scopes << name
     end
   end
+  
+  class << self
+    def build_ar_like_record(clazz, attributes, original_search_doc = nil)
+      record = clazz.new
+      record.instance_variable_set("@attributes", attributes)
+      record.instance_variable_set("@readonly", true)
+      record.instance_variable_set("@new_record", false)
+      record.instance_variable_set("@original_search_doc", original_search_doc) if original_search_doc
+      record
+    end
+  end
 end
 
 require "supernova/numeric_extensions"

data/lib/supernova/criteria.rb

@@ -2,7 +2,7 @@ class Supernova::Criteria
   DEFAULT_PER_PAGE = 25
   FIRST_PAGE = 1
   
-  attr_accessor :filters, :search_options, :clazz
+  attr_accessor :filters, :search_options, :clazz, :results
 
   class << self
     def method_missing(*args)
@@ -138,8 +138,22 @@ class Supernova::Criteria
   def to_parameters
     implement_in_subclass
   end
-
+  
+  def populate
+    @results = execute if !populated?
+    self
+  end
+  
   def to_a
+    populate
+    results
+  end
+  
+  def populated?
+    instance_variables.include?("@results")
+  end
+  
+  def execute
     implement_in_subclass
   end
   
@@ -170,8 +184,9 @@ class Supernova::Criteria
   end
 
   def method_missing(*args, &block)
-    if args.length == 1 && Array.new.respond_to?(args.first)
-      to_a.send(args.first, &block)
+    if Supernova::Collection.instance_methods.include?(args.first.to_s)
+      populate
+      @results.send(*args, &block)
     elsif self.named_scope_defined?(args.first)
       self.merge(self.search_options[:named_scope_class].send(*args)) # merge named scope and current criteria
     else

data/lib/supernova/solr_criteria.rb

@@ -87,20 +87,11 @@ class Supernova::SolrCriteria < Supernova::Criteria
   end
   
   def build_doc(hash)
-    return hash if !hash["type"].respond_to?(:constantize)
-    doc = hash["type"].constantize.new
-    doc.instance_variable_set("@solr_doc", hash)
-    atts = convert_doc_attributes(hash)
-    if doc.instance_variables.include?("@attributes")
-      doc.instance_variable_set("@attributes", atts.except("type"))
+    if hash["type"].respond_to?(:constantize)
+      Supernova.build_ar_like_record(hash["type"].constantize, convert_doc_attributes(hash), hash)
     else
-      atts.each do |key, value|
-        doc.send(:"#{key}=", value) if doc.respond_to?(:"#{key}=")
-      end
+      hash
     end
-    doc.instance_variable_set("@readonly", true)
-    doc.instance_variable_set("@new_record", false)
-    doc
   end
   
   # called in build doc, all hashes have strings as keys!!!
@@ -137,7 +128,7 @@ class Supernova::SolrCriteria < Supernova::Criteria
     end
   end
   
-  def to_a
+  def execute
     response = Supernova::Solr.connection.post("select", :data => to_params)
     collection = Supernova::Collection.new(current_page, per_page, response["response"]["numFound"])
     collection.replace(build_docs(response["response"]["docs"]))

data/lib/supernova/solr_indexer.rb

@@ -72,14 +72,43 @@ class Supernova::SolrIndexer
   
   def index!
     index_query(query_to_index) do |row|
-      row_to_solr(row)
+      map_for_solr(row)
     end
   end
   
-  def row_to_solr(row)
+  def map_for_solr(row)
+    map_hash_keys_to_solr(
+      if self.respond_to?(:extra_attributes_from_record) && self.class.clazz
+        row.merge(self.extra_attributes_from_record(Supernova.build_ar_like_record(self.class.clazz, row)).stringify_keys)
+      elsif self.respond_to?(:row_to_solr)
+        puts "DEPRECATION WARNING: use before_index instead of row_to_solr! in #{caller.first}"
+        self.row_to_solr(row)
+      else
+        self.before_index(row)
+      end
+    )
+  end
+  
+  def before_index(row)
     row
   end
   
+  def map_hash_keys_to_solr(hash)
+    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 options[:type] == :date 
+          value = Time.utc(value.year, value.month, value.day) if value.is_a?(Date)
+          value = value.utc.iso8601 
+        end
+        hash["#{field}_#{self.class.suffix_from_type(options[:type])}"] = value
+      end
+    end
+    hash["type"] = self.class.clazz.to_s if self.class.clazz
+    hash
+  end
+  
   def table_name
     self.class.table_name || (self.class.clazz && self.class.clazz.respond_to?(:table_name) ? self.class.clazz.table_name : nil)
   end
@@ -99,7 +128,7 @@ class Supernova::SolrIndexer
   
   def defined_fields
     self.class.field_definitions.map do |field, options|
-      sql_column_from_field_and_type(field, options[:type]) if options[:virtual] != true
+      field.to_s if options[:virtual] != true
     end.compact
   end
   
@@ -219,7 +248,8 @@ class Supernova::SolrIndexer
       %(cd #{File.dirname(index_file_path)} && curl -s '#{solr_url}/update/json?commit=true' --data-binary @#{File.basename(index_file_path)} -H 'Content-type:application/json')
     end
     out = Kernel.send(:`, cmd)
-    FileUtils.rm_f(self.index_file_path) if out.to_s.include?(%(<int name=\"status\">0</int>))
+    raise "unable to index #{index_file_path}: #{out}" if !out.to_s.include?(%(<int name=\"status\">0</int>))
+    FileUtils.rm_f(self.index_file_path)
     out
   end
 end

data/lib/supernova/thinking_sphinx_criteria.rb

@@ -34,7 +34,7 @@ class Supernova::ThinkingSphinxCriteria < Supernova::Criteria
     [(self.search_options[:search] || Array.new).join(" "), sphinx_options]
   end
   
-  def to_a
+  def execute
     ThinkingSphinx.search(*self.to_params)
   end
   

data/spec/integration/solr_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe "Solr" do
   before(:each) do
     Supernova::Solr.instance_variable_set("@connection", nil)
-    Supernova::Solr.url = "http://localhost:8983/solr/"
+    Supernova::Solr.url = "http://localhost:8985/solr/"
     Supernova::Solr.truncate!
     Offer.criteria_class = Supernova::SolrCriteria
     root = Geokit::LatLng.new(47, 11)
@@ -41,7 +41,7 @@ describe "Solr" do
       has :user_id, :type => :integer
       has :popularity, :type => :integer
       
-      def row_to_solr(row)
+      def before_index(row)
         row["indexed_at_dt"] = Time.now.utc.iso8601
         row
       end
@@ -54,9 +54,9 @@ describe "Solr" do
       offer2 = Offer.create!(:user_id => 2, :popularity => 20)
       indexer = OfferIndex.new(:db => ActiveRecord::Base.connection)
       indexer.index!
-      OfferIndex.search_scope.to_a.first.instance_variable_get("@solr_doc")["indexed_at_dt"].should_not be_nil
-      OfferIndex.search_scope.to_a.total_entries.should == 2
-      OfferIndex.search_scope.order("user_id desc").to_a.should == [offer2, offer1]
+      OfferIndex.search_scope.first.instance_variable_get("@original_search_doc")["indexed_at_dt"].should_not be_nil
+      OfferIndex.search_scope.total_entries.should == 2
+      OfferIndex.search_scope.order("user_id desc").populate.results.should == [offer2, offer1]
       indexer.instance_variable_get("@index_file_path").should be_nil
     end
     
@@ -66,9 +66,9 @@ describe "Solr" do
       indexer = OfferIndex.new(:db => ActiveRecord::Base.connection, :max_rows_to_direct_index => 0)
       indexer.index!
       indexer.instance_variable_get("@index_file_path").should_not be_nil
-      OfferIndex.search_scope.to_a.total_entries.should == 2
-      OfferIndex.search_scope.to_a.first.instance_variable_get("@solr_doc")["indexed_at_dt"].should_not be_nil
-      OfferIndex.search_scope.order("user_id desc").to_a.should == [offer2, offer1]
+      OfferIndex.search_scope.total_entries.should == 2
+      OfferIndex.search_scope.first.instance_variable_get("@original_search_doc")["indexed_at_dt"].should_not be_nil
+      OfferIndex.search_scope.order("user_id desc").populate.results.should == [offer2, offer1]
       File.should_not be_exists(indexer.instance_variable_get("@index_file_path"))
     end
     
@@ -78,39 +78,63 @@ describe "Solr" do
       indexer = OfferIndex.new(:db => ActiveRecord::Base.connection, :max_rows_to_direct_index => 0, :local_solr => true)
       indexer.index!
       indexer.instance_variable_get("@index_file_path").should_not be_nil
-      OfferIndex.search_scope.to_a.first.instance_variable_get("@solr_doc")["indexed_at_dt"].should_not be_nil
-      OfferIndex.search_scope.to_a.total_entries.should == 2
-      OfferIndex.search_scope.order("user_id desc").to_a.should == [offer2, offer1]
+      OfferIndex.search_scope.first.instance_variable_get("@original_search_doc")["indexed_at_dt"].should_not be_nil
+      OfferIndex.search_scope.total_entries.should == 2
+      OfferIndex.search_scope.order("user_id desc").populate.results.should == [offer2, offer1]
       File.should_not be_exists(indexer.instance_variable_get("@index_file_path"))
     end
+    
+    describe "with extra_attributes_from_doc method defined" do
+      
+      class OfferIndexWitheExtraSearchMethodFromDoc < Supernova::SolrIndexer
+        has :user_id, :type => :integer
+        has :popularity, :type => :integer
+        has :upcased_text, :type => :text, :virtual => true
+        has :text, :type => :text
+        
+        clazz Offer
+        
+        def extra_attributes_from_record(record)
+          { :upcased_text => record.text.to_s.upcase.presence }
+        end
+      end
+      
+      it "sets the capitalize_text attribute" do
+        Offer.create!(:user_id => 2, :popularity => 20, :text => "lower_text")
+        indexer = OfferIndexWitheExtraSearchMethodFromDoc.new(:db => ActiveRecord::Base.connection)
+        indexer.index!
+        offer = OfferIndexWitheExtraSearchMethodFromDoc.search_scope.first
+        offer.instance_variable_get("@original_search_doc")["upcased_text_t"].should == "LOWER_TEXT"
+      end
+    end
   end
   
   describe "searching" do
     it "returns the correct current_page when nil" do
-      new_criteria.to_a.current_page.should == 1
+      new_criteria.current_page.should == 1
     end
     
     it "returns the correct page when set" do
-      new_criteria.paginate(:page => 10).to_a.current_page.should == 10
+      new_criteria.paginate(:page => 10).current_page.should == 10
     end
     
     it "the correct per_page when set" do
-      new_criteria.paginate(:per_page => 10).to_a.per_page.should == 10
+      new_criteria.paginate(:per_page => 10).per_page.should == 10
     end
     
     it "the correct per_page when not set" do
-      new_criteria.to_a.per_page.should == 25
+      new_criteria.per_page.should == 25
     end
     
     describe "plain text search" do
       it "returns the correct entries for 1 term" do
-        new_criteria.search("text_t:Hans").to_a.map { |h| h["id"] }.should == [1]
-        new_criteria.search("text_t:Hans").search("text_t:Meyer").to_a.map { |h| h["id"] }.should == [1]
-        new_criteria.search("text_t:Marek").to_a.map { |h| h["id"] }.should == [2]
+        new_criteria.search("text_t:Hans").map { |h| h["id"] }.should == [1]
+        new_criteria.search("text_t:Hans").search("text_t:Meyer").map { |h| h["id"] }.should == [1]
+        new_criteria.search("text_t:Marek").map { |h| h["id"] }.should == [2]
       end
       
       it "returns the correct options for a combined search" do
-        new_criteria.search("text_t:Hans", "text_t:Marek").to_a.map.should == []
+        new_criteria.search("text_t:Hans", "text_t:Marek").populate.results.should == []
       end
     end
     
@@ -119,14 +143,14 @@ describe "Solr" do
       "popularity_i" => 10, "location_p" => "47,11"
     }.each do |key, value|
       it "sets #{key} to #{value}" do
-        doc = new_criteria.search("text_t:Hans").to_a.first.instance_variable_get("@solr_doc")[key].should == value
+        doc = new_criteria.search("text_t:Hans").first.instance_variable_get("@original_search_doc")[key].should == value
       end
     end
     
     describe "nearby search" do
       { 49.kms => 1, 51.kms => 2 }.each do |distance, total_entries|
         it "returns #{total_entries} for distance #{distance}" do
-          new_criteria.attribute_mapping(:location => { :type => :location }).near(47, 11).within(distance).to_a.total_entries.should == total_entries
+          new_criteria.attribute_mapping(:location => { :type => :location }).near(47, 11).within(distance).total_entries.should == total_entries
         end
       end
     end
@@ -145,25 +169,25 @@ describe "Solr" do
           :type => "Offer"
         )
         Supernova::Solr.connection.commit
-        raise "There should be 3 docs" if new_criteria.to_a.total_entries != 3
-        new_criteria.with(:user_id_i.not => nil).to_a.map { |h| h["id"] }.should == [1, 2]
+        raise "There should be 3 docs" if new_criteria.total_entries != 3
+        new_criteria.with(:user_id_i.not => nil).map { |h| h["id"] }.should == [1, 2]
       end
       
       it "finds the correct values for not specific value" do
-        new_criteria.with(:user_id_i.not => 1).to_a.map { |h| h["id"] }.should == [2]
+        new_criteria.with(:user_id_i.not => 1).map { |h| h["id"] }.should == [2]
       end
     end
     
     describe "gt and lt searches" do
       { :gt => [2], :gte => [1, 2], :lt => [], :lte => [1] }.each do |type, ids|
         it "finds ids #{ids.inspect} for #{type}" do
-          new_criteria.with(:user_id_i.send(type) => 1).to_a.map { |row| row["id"] }.sort.should == ids
+          new_criteria.with(:user_id_i.send(type) => 1).map { |row| row["id"] }.sort.should == ids
         end
       end
     end
     
     it "returns the correct objects" do
-      new_criteria.with(:user_id_i => 1).to_a.first.should be_an_instance_of(Offer)
+      new_criteria.with(:user_id_i => 1).first.should be_an_instance_of(Offer)
     end
     
     { :id => 1, :user_id => 1, :enabled => false, :text => "Hans Meyer", :popularity => 10 }.each do |key, value|
@@ -173,45 +197,45 @@ describe "Solr" do
           :enabled => { :type => :boolean },
           :popularity => { :type => :integer },
           :text => { :type => :text}
-        ).with(:id => "offers/1").to_a.first
+        ).with(:id => "offers/1").first
         doc.send(key).should == value
       end
     end
     
     it "combines filters" do
-      new_criteria.with(:user_id_i => 1, :enabled_b => false).to_a.total_entries.should == 1
-      new_criteria.with(:user_id_i => 1, :enabled_b => true).to_a.total_entries.should == 0
+      new_criteria.with(:user_id_i => 1, :enabled_b => false).total_entries.should == 1
+      new_criteria.with(:user_id_i => 1, :enabled_b => true).total_entries.should == 0
     end
     
     it "uses without correctly" do
-      new_criteria.without(:user_id_i => 1).to_a.map(&:id).should == [2]
-      new_criteria.without(:user_id_i => 2).to_a.map(&:id).should == [1]
-      new_criteria.without(:user_id_i => 2).without(:user_id_i => 1).to_a.map(&:id).should == []
+      new_criteria.without(:user_id_i => 1).map(&:id).should == [2]
+      new_criteria.without(:user_id_i => 2).map(&:id).should == [1]
+      new_criteria.without(:user_id_i => 2).without(:user_id_i => 1).map(&:id).should == []
     end
     
     it "uses the correct orders" do
-      new_criteria.order("id desc").to_a.map(&:id).should == [2, 1]
-      new_criteria.order("id asc").to_a.map(&:id).should == [1, 2]
+      new_criteria.order("id desc").map(&:id).should == [2, 1]
+      new_criteria.order("id asc").map(&:id).should == [1, 2]
     end
     
     it "uses the correct pagination attributes" do
-      new_criteria.with(:user_id_i => 1, :enabled_b => false).to_a.total_entries.should == 1
+      new_criteria.with(:user_id_i => 1, :enabled_b => false).total_entries.should == 1
       new_criteria.with(:user_id_i => 1, :enabled_b => false).length.should == 1
-      new_criteria.with(:user_id_i => 1, :enabled_b => false).paginate(:page => 10).to_a.total_entries.should == 1
+      new_criteria.with(:user_id_i => 1, :enabled_b => false).paginate(:page => 10).total_entries.should == 1
       new_criteria.with(:user_id_i => 1, :enabled_b => false).paginate(:page => 10).length.should == 0
       
-      new_criteria.paginate(:per_page => 1, :page => 1).to_a.map(&:id).should == [1]
-      new_criteria.paginate(:per_page => 1, :page => 2).to_a.map(&:id).should == [2]
+      new_criteria.paginate(:per_page => 1, :page => 1).map(&:id).should == [1]
+      new_criteria.paginate(:per_page => 1, :page => 2).map(&:id).should == [2]
     end
     
     it "handels empty results correctly" do
-      results = new_criteria.with(:user_id_i => 1, :enabled_b => true).to_a
+      results = new_criteria.with(:user_id_i => 1, :enabled_b => true)
       results.total_entries.should == 0
       results.current_page.should == 1
     end
     
     it "only sets specific attributes" do
-      results = new_criteria.select(:user_id_i).with(:user_id_i => 1).to_a
+      results = new_criteria.select(:user_id_i).with(:user_id_i => 1)
       results.length.should == 1
       results.first.should == { "id" => "offers/1", "user_id_i" => 1 }
     end

data/spec/supernova/criteria_spec.rb

@@ -3,7 +3,9 @@ require "ostruct"
 
 describe "Supernova::Criteria" do
   let(:scope) { Supernova::Criteria.new }
-  
+  before(:each) do
+    scope.stub!(:execute).and_return [].paginate(:page => 1)
+  end
   
   describe "#initialize" do
     it "can be initialized" do
@@ -110,11 +112,68 @@ describe "Supernova::Criteria" do
   end
   
   it "to_a raises an implement in subclass error" do
+    scope.unstub(:execute)
     lambda {
-      scope.to_a
+      scope.execute
     }.should raise_error("implement in subclass")
   end
   
+  describe "#to_a" do
+    it "calls populate" do
+      scope.should_receive(:populate)
+      scope.to_a
+    end
+    
+    it "returns the results" do
+      res = double("results")
+      scope.instance_variable_set("@results", res)
+      scope.to_a.should == res
+    end
+  end
+  
+  describe "#populate" do
+    it "returns self when" do
+      scope.stub!(:populated?).and_return true
+      scope.populate.should == scope
+    end
+    
+    it "does not change @results when already populated" do
+      res = double("results")
+      scope.instance_variable_set("@results", res)
+      scope.stub!(:populated?).and_return true
+      scope.populate.should == scope
+      scope.instance_variable_get("@results").should == res
+    end
+    
+    it "returns the scope when not populated yet" do
+      scope.populate.should == scope
+    end
+    
+    it "calls execute" do
+      scope.should_receive(:execute).and_return []
+      scope.populate
+    end
+    
+    it "assigns the result of populate" do
+      result = double("result")
+      scope.stub!(:execute).and_return result
+      scope.populate
+      scope.instance_variable_get("@results").should == result
+    end
+  end
+  
+  describe "#populated?" do
+    it "returns false when @results not set" do
+      scope.should_not be_populated
+    end
+    
+    it "returns true when instance variable set" do
+      scope.stub!(:execute).and_return []
+      scope.populate
+      scope.should be_populated
+    end
+  end
+  
   describe "with to_a stubbed" do
     let(:array_double) { double("array") }
     
@@ -122,17 +181,19 @@ describe "Supernova::Criteria" do
       scope.stub!(:to_a).and_return array_double
     end
     
-    [ :first, :each, :count, :last ].each do |method|
+    [ :first, :each, :count, :last, :total_entries ].each do |method|
       it "forwards #{method} to array" do
-        ret = double("ret")
-        array_double.should_receive(method).and_return ret
+        results = double("ret")
+        scope.instance_variable_set("@results", results)
+        scope.should_receive(:populated?).and_return false
         scope.send(method)
       end
     end
     
     it "hands given blocks in" do
       array = [1, 2, 3]
-      scope.stub!(:to_a).and_return array
+      scope.instance_variable_set("@results", array)
+      scope.stub!(:populated?).and_return true
       called = []
       scope.each do |i|
         called << i
@@ -155,6 +216,13 @@ describe "Supernova::Criteria" do
       }.should raise_error(NoMethodError)
     end
     
+    it "forwards all array methods to @results" do
+      results = double("results")
+      scope.instance_variable_set("@results", results)
+      results.should_receive(:index, "1")
+      scope.index("1")
+    end
+    
     it "calls named_scope_defined" do
       scope.should_receive(:named_scope_defined?).with(:rgne).and_return false
       scope.method_missing(:rgne) rescue nil
@@ -195,10 +263,6 @@ describe "Supernova::Criteria" do
     end
   end
   
-  describe "#with_scopes" do
-    
-  end
-  
   describe "#merge" do
     let(:criteria) { Supernova::Criteria.new.order("popularity asc").with(:a => 1).conditions(:b => 2).search("New Search") }
     let(:new_crit) { Supernova::Criteria.new.order("popularity desc").with(:c => 8).conditions(:e => 9).search("Search") }

data/spec/supernova/solr_criteria_spec.rb

@@ -163,7 +163,7 @@ describe Supernova::SolrCriteria do
     end
   end
 
-  describe "#to_a" do
+  describe "#execute" do
     let(:params) { double("params") }
     
     before(:each) do
@@ -173,45 +173,45 @@ describe Supernova::SolrCriteria do
     
     it "calls to_params" do
       criteria.should_receive(:to_params).and_return params
-      criteria.to_a
+      criteria.execute
     end
     
     it "calls get with select and params" do
       rsolr.should_receive(:post).with("select", :data => params).and_return solr_response
-      criteria.to_a
+      criteria.execute
     end
     
     it "returns a Supernova::Collection" do
-      criteria.to_a.should be_an_instance_of(Supernova::Collection)
+      criteria.execute.should be_an_instance_of(Supernova::Collection)
     end
     
     it "sets the correct page when page is nil" do
-      criteria.to_a.current_page.should == 1
+      criteria.execute.current_page.should == 1
     end
     
     it "sets the correct page when page is 1" do
-      criteria.paginate(:page => 1).to_a.current_page.should == 1
+      criteria.paginate(:page => 1).execute.current_page.should == 1
     end
     
     it "sets the correct page when page is 2" do
-      criteria.paginate(:page => 2).to_a.current_page.should == 2
+      criteria.paginate(:page => 2).execute.current_page.should == 2
     end
     
     it "sets the correct per_page when zero" do
-      criteria.paginate(:page => 2, :per_page => nil).to_a.per_page.should == 25
+      criteria.paginate(:page => 2, :per_page => nil).execute.per_page.should == 25
     end
     
     it "sets the custom per_page when given" do
-      criteria.paginate(:page => 2, :per_page => 10).to_a.per_page.should == 10
+      criteria.paginate(:page => 2, :per_page => 10).execute.per_page.should == 10
     end
     
     it "sets the correct total_entries" do
-      criteria.paginate(:page => 2, :per_page => 10).to_a.total_entries.should == 2
+      criteria.paginate(:page => 2, :per_page => 10).execute.total_entries.should == 2
     end
     
     it "calls build_docs with returned docs" do
       criteria.should_receive(:build_docs).with(docs).and_return []
-      criteria.to_a
+      criteria.execute
     end
     
     it "calls replace on collection wit returned docs" do
@@ -220,7 +220,7 @@ describe Supernova::SolrCriteria do
       built_docs = double("built docs")
       criteria.stub!(:build_docs).and_return built_docs
       col.should_receive(:replace).with(built_docs)
-      criteria.to_a
+      criteria.execute
     end
   end
   
@@ -283,9 +283,7 @@ describe Supernova::SolrCriteria do
       criteria.build_doc(row).should == row
     end
     
-    it "assigns the attributes returned from convert_doc_attributes to attributes when instance variable exists" do
-      str = String.new
-      str.instance_variable_set("@attributes", {})
+    it "assigns the attributes returned from convert_doc_attributes to attributes when record responds to attributes=" do
       atts = { :title => "Hello" }
       row = { "type" => "Offer" }
       criteria.should_receive(:convert_doc_attributes).with(row).and_return atts
@@ -293,9 +291,9 @@ describe Supernova::SolrCriteria do
       doc.instance_variable_get("@attributes").should == atts
     end
     
-    it "sets the original solr_doc" do
-      solr_doc = { "type" => "Offer", "id" => "offers/id" }
-      criteria.build_doc(solr_doc).instance_variable_get("@solr_doc").should == solr_doc
+    it "sets the original original_search_doc" do
+      original_search_doc = { "type" => "Offer", "id" => "offers/id" }
+      criteria.build_doc(original_search_doc).instance_variable_get("@original_search_doc").should == original_search_doc
     end
     
     it "should be readonly" do

data/spec/supernova/solr_indexer_spec.rb

@@ -6,11 +6,13 @@ describe Supernova::SolrIndexer do
   let(:to_index) { { :id => 1, :title => "Some Title"} }
   let(:file_stub) { double("file").as_null_object }
   let(:solr) { double("solr").as_null_object }
+  let(:solr_index_response) { %(<int name="status">0</int>) }
   
   let(:indexer) do
     indexer = Supernova::SolrIndexer.new
     indexer.db = db
     indexer.stub!(:system).and_return true
+    Kernel.stub!(:`).and_return solr_index_response
     indexer
   end
   
@@ -68,17 +70,81 @@ describe Supernova::SolrIndexer do
       indexer.index!
     end
     
-    it "calls row_to_solr with all returned rows from sql" do
+    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(:row_to_solr).with(row1)
+      indexer.should_receive(:map_for_solr).with(row1)
       indexer.stub!(:index_query).and_yield(row1)
       indexer.index!
     end
   end
   
+  describe "#map_for_solr" do
+    let(:row) { { "a" => 1 } }
+    
+    before(:each) do
+      indexer.stub!(:puts)
+    end
+    
+    it "calls row_to_solr" do
+      indexer.should_not_receive(:before_index)
+      indexer.should_receive(:row_to_solr).with(row).and_return row
+      indexer.map_for_solr(row)
+    end
+    
+    it "prints a deprecation warning when using row_to_solr" do
+      indexer.stub!(:row_to_solr).with(row).and_return row
+      indexer.should_receive(:puts).with(/DEPRECATION WARNING: use before_index instead of row_to_solr! in/)
+      indexer.map_for_solr(row)
+    end
+    
+    it "calls before_index when row_to_solr is not defined" do
+      row = { "a" => 1 }
+      indexer.should_receive(:before_index).with(row).and_return row
+      indexer.map_for_solr(row)
+    end
+    
+    it "calls map_hash_keys_to_solr with result of row_to_solr" do
+      dummy_row = double("dummy row")
+      indexer.stub!(:row_to_solr).and_return dummy_row
+      indexer.should_receive(:map_hash_keys_to_solr).with(dummy_row)
+      indexer.map_for_solr({ "a" => 1 })
+    end
+    
+    describe "with the index defining extra_attributes_from_record" do
+      let(:index) { SolrOfferIndex.new }
+      let(:offer_double) { double("Solr Offer", :id => 88).as_null_object }
+      
+      class SolrOfferIndex < Supernova::SolrIndexer
+        clazz Offer
+        has :created_at, :type => :date
+        has :offer_id, :type => :integer
+        
+        def extra_attributes_from_record(doc)
+          { :offer_code => "OFFER_#{doc.id}" }
+        end
+      end
+      
+      it "calls Supernova.build_ar_like_record with correct parameters" do
+        Supernova.should_receive(:build_ar_like_record).and_return offer_double
+        SolrOfferIndex.new("offer_id" => 77, "type" => "Offer").map_for_solr(row)
+      end
+      
+      it "includes the original attributes" do
+        index = SolrOfferIndex.new
+        index.map_for_solr({ "a" => 2 })["a"].should == 2
+      end
+      
+      it "includes the attributes from extra_attributes_from_record" do
+        index = SolrOfferIndex.new
+        index.map_for_solr({ "a" => 2, "id" => "88" })["offer_code"].should == "OFFER_88"
+        hash = { :a => 1, "a" => 2 }
+      end
+    end
+  end
+  
   describe "validate_lat" do
     { nil => nil, 10 => 10.0, 90.1 => nil, 90 => 90, -90.1 => nil, -90 => -90 }.each do |from, to|
       it "converts #{from} to #{to}" do
@@ -118,9 +184,9 @@ describe Supernova::SolrIndexer do
     end
   end
   
-  describe "#row_to_solr" do
+  describe "#before_index" do
     it "returns the db row by default" do
-      indexer.row_to_solr("id" => 1).should == { "id" => 1 }
+      indexer.before_index("id" => 1).should == { "id" => 1 }
     end
   end
   
@@ -138,6 +204,56 @@ describe Supernova::SolrIndexer do
     end
   end
   
+  describe "#map_hash_keys_to_solr" do
+    class CustomSolrIndex < Supernova::SolrIndexer
+      has :offer_id, :type => :integer
+      has :lat, :type => :float
+      has :lng, :type => :float
+      has :created_at, :type => :date
+      has :checkin_date, :type => :date
+    end
+    
+    it "maps float fields" do
+      index = CustomSolrIndex.new
+      index.map_hash_keys_to_solr("lat" => 49.0)["lat_f"].should == 49.0
+    end
+    
+    it "maps time fields to iso8601" do
+      index = CustomSolrIndex.new
+      time = Time.parse("2011-02-03 11:20:30")
+      index.map_hash_keys_to_solr("created_at" => time)["created_at_dt"].should == "2011-02-03T10:20:30Z"
+    end
+    
+    it "maps date fields to iso8601" do
+      date = Date.new(2011, 1, 2)
+      CustomSolrIndex.new.map_hash_keys_to_solr("checkin_date" => date)["checkin_date_dt"].should == "2011-01-02T00:00:00Z"
+    end
+    
+    it "sets the indexed_at time" do
+      Time.stub!(:now).and_return Time.parse("2011-02-03T11:20:30Z")
+      CustomSolrIndex.new.map_hash_keys_to_solr({})["indexed_at_dt"].should == "2011-02-03T11:20:30Z"
+      Time.unstub!(:now)
+    end
+    
+    it "adds the class as type when class set" do
+      clazz = Class.new(Supernova::SolrIndexer)
+      clazz.clazz Offer
+      clazz.new.map_hash_keys_to_solr({})["type"].should == "Offer"
+    end
+    
+    it "uses the table_name as prefix for ids" do
+      clazz = Class.new(Supernova::SolrIndexer)
+      clazz.table_name :people
+      clazz.new.map_hash_keys_to_solr({ "id" => 88 })["id_s"].should == "people/88"
+    end
+    
+    it "adds the sets the cla" do
+      clazz = Class.new(Supernova::SolrIndexer)
+      clazz.clazz Offer
+      clazz.new.map_hash_keys_to_solr({})["type"].should == "Offer"
+    end
+  end
+  
   describe "#index_query" do
     let(:query) { %(SELECT CONCAT("user_", id) AS id, title FROM people WHERE type = 'User') }
     
@@ -300,13 +416,13 @@ describe Supernova::SolrIndexer do
     
     it "calls the correct curl command" do
       indexer = Supernova::SolrIndexer.new(:index_file_path => "/tmp/some_path.json", :local_solr => true)
-      Kernel.should_receive(:`).with("curl -s 'http://solr.xx:9333/solr/update/json?commit=true\\&stream.file=/tmp/some_path.json'").and_return "<\"status\">0"
+      Kernel.should_receive(:`).with("curl -s 'http://solr.xx:9333/solr/update/json?commit=true\\&stream.file=/tmp/some_path.json'").and_return solr_index_response
       indexer.do_index_file(:local => true)
     end
     
     it "calls rm on file" do
       indexer = Supernova::SolrIndexer.new(:index_file_path => "/tmp/some_path.json", :local_solr => true)
-      Kernel.should_receive(:`).with("curl -s 'http://solr.xx:9333/solr/update/json?commit=true\\&stream.file=/tmp/some_path.json'").and_return %(<int name="status">0</int>)
+      Kernel.should_receive(:`).with("curl -s 'http://solr.xx:9333/solr/update/json?commit=true\\&stream.file=/tmp/some_path.json'").and_return solr_index_response
       FileUtils.should_receive(:rm_f).with("/tmp/some_path.json")
       indexer.do_index_file(:local => true)
     end
@@ -315,13 +431,15 @@ describe Supernova::SolrIndexer do
       indexer = Supernova::SolrIndexer.new(:index_file_path => "/tmp/some_path.json", :local_solr => true)
       Kernel.should_receive(:`).with("curl -s 'http://solr.xx:9333/solr/update/json?commit=true\\&stream.file=/tmp/some_path.json'").and_return %(<int name="status">1</int>)
       FileUtils.should_not_receive(:rm_f).with("/tmp/some_path.json")
-      indexer.do_index_file(:local => true)
+      lambda {
+        indexer.do_index_file(:local => true)
+      }.should raise_error
     end
     
     it "executes the correct curl call when not local" do
       # curl 'http://localhost:8983/solr/update/json?commit=true' --data-binary @books.json -H 'Content-type:application/json'
       indexer.index_file_path = "/tmp/some_path.json"
-      Kernel.should_receive(:`).with("cd /tmp && curl -s 'http://solr.xx:9333/solr/update/json?commit=true' --data-binary @some_path.json -H 'Content-type:application/json'")
+      Kernel.should_receive(:`).with("cd /tmp && curl -s 'http://solr.xx:9333/solr/update/json?commit=true' --data-binary @some_path.json -H 'Content-type:application/json'").and_return solr_index_response
       indexer.do_index_file
     end
   end
@@ -394,9 +512,7 @@ describe Supernova::SolrIndexer do
       custom_indexer.defined_fields
     end
     
-    ["title AS title_t", "artist_id AS artist_id_i", "description AS description_t", 
-      %(IF(created_at IS NULL, NULL, CONCAT(REPLACE(created_at, " ", "T"), "Z")) AS created_at_dt)
-    ].each do |field|
+    ["title", "artist_id", "description", "created_at"].each do |field|
       it "includes field #{field.inspect}" do
         custom_indexer.defined_fields.should include(field)
       end
@@ -406,7 +522,7 @@ describe Supernova::SolrIndexer do
       clazz = Class.new(Supernova::SolrIndexer)
       clazz.has :location, :type => :location, :virtual => true
       clazz.has :title, :type => :string
-      clazz.new.defined_fields.should == ["title AS title_s"]
+      clazz.new.defined_fields.should == ["title"]
     end
   end
   

data/spec/supernova_spec.rb

@@ -84,4 +84,45 @@ describe Supernova do
       end
     end
   end
+
+  describe "#build_ar_like_record" do
+    let(:offer_double) { double("offer").as_null_object }
+    
+    before(:each) do
+      Offer.stub!(:new).and_return offer_double
+    end
+    
+    it "is callable" do
+      Supernova.should respond_to(:build_ar_like_record)
+    end
+    
+    it "creates a new instance" do
+      Offer.should_receive(:new).and_return offer_double
+      Supernova.build_ar_like_record(Offer, {})
+    end
+    
+    it "sets the attributes" do
+      atts = { :a => 1 }
+      offer_double.should_receive(:instance_variable_set).with("@attributes", atts)
+      Supernova.build_ar_like_record(Offer, atts)
+    end
+    
+    it "returns the record" do
+      Supernova.build_ar_like_record(Offer, {}).should == offer_double
+    end
+    
+    it "sets readonly to true" do
+      Supernova.build_ar_like_record(Offer, {}).instance_variable_get("@readonly").should == true
+    end
+    
+    it "sets new_record to false" do
+      Supernova.build_ar_like_record(Offer, {}).instance_variable_get("@new_record").should == false
+    end
+    
+    it "sets the original_search_doc hash when given" do
+      original_search_doc = double("original_search_doc")
+      doc = Supernova.build_ar_like_record(Offer, {}, original_search_doc)
+      doc.instance_variable_get("@original_search_doc").should == original_search_doc
+    end
+  end
 end

data/supernova.gemspec

@@ -5,13 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.3.12"
+  s.version = "0.3.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-06-17}
+  s.date = %q{2011-06-29}
   s.description = %q{Unified search scopes}
   s.email = %q{tobias.schwab@dynport.de}
+  s.executables = ["start_solr"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -27,6 +28,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "autotest/discover.rb",
+    "bin/start_solr",
     "lib/supernova.rb",
     "lib/supernova/collection.rb",
     "lib/supernova/condition.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 3
-  - 12
-  version: 0.3.12
+  - 13
+  version: 0.3.13
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 Z
+date: 2011-06-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -211,8 +211,8 @@ dependencies:
   type: :development
 description: Unified search scopes
 email: tobias.schwab@dynport.de
-executables: []
-
+executables: 
+- start_solr
 extensions: []
 
 extra_rdoc_files: 
@@ -229,6 +229,7 @@ files:
 - Rakefile
 - VERSION
 - autotest/discover.rb
+- bin/start_solr
 - lib/supernova.rb
 - lib/supernova/collection.rb
 - lib/supernova/condition.rb