supernova 0.6.7 → 0.6.8

data/spec/integration/solr_spec.rb

@@ -1,24 +1,25 @@
+# -*- encoding : utf-8 -*-
 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:8985/solr/"
+    Supernova::Solr.url = "http://localhost:8983/solr/supernova_test"
     Supernova::Solr.truncate!
     Offer.criteria_class = Supernova::SolrCriteria
     root = Geokit::LatLng.new(47, 11)
     # endpoint = root.endpoint(90, 50, :units => :kms)
     e_lat = 46.9981112912042
     e_lng = 11.6587158814378
-    Supernova::Solr.connection.add(:id => "offers/1", :type => "Offer", :user_id_i => 1, :enabled_b => false, 
+    Supernova::Solr.add(:id => "offers/1", :type => "Offer", :user_id_i => 1, :enabled_b => false, 
       :text_t => "Hans Meyer", :popularity_i => 10, 
       :location_p => "#{root.lat},#{root.lng}", :type => "Offer"
     )
-    Supernova::Solr.connection.add(:id => "offers/2", :user_id_i => 2, :enabled_b => true, :text_t => "Marek Mintal", 
+    Supernova::Solr.add(:id => "offers/2", :user_id_i => 2, :enabled_b => true, :text_t => "Marek Mintal", 
       :popularity_i => 1, 
       :location_p => "#{e_lat},#{e_lng}", :type => "Offer"
     )
-    Supernova::Solr.connection.commit
+    Supernova::Solr.commit!
   end
   
   after(:each) do
@@ -40,7 +41,7 @@ describe "Solr" do
           { :title_s => "Title2", :id => 2, :type => "Record" } 
         ]
       )
-      response = Supernova::Solr.connection.get('select', :params => { :q=>'*:*', :start=>0, :rows=>10, :sort => "id asc" })
+      response = JSON.parse(Typhoeus::Request.post(Supernova::Solr.select_url, :params => { :q=>'*:*', :start=>0, :rows=>10, :sort => "id asc", :wt => "json" }).body)
       response["response"]["docs"].first.should == { "title_s" => "Title1", "id" => "1", "type" => "Record" }
       response["response"]["docs"].at(1).should == { "title_s" => "Title2", "id" => "2", "type" => "Record" }
     end
@@ -49,7 +50,7 @@ describe "Solr" do
   describe "#indexing" do
     before(:each) do
       Supernova::Solr.truncate!
-      Supernova::Solr.connection.commit
+      Supernova::Solr.commit!
     end
     
     class OfferIndex < Supernova::SolrIndexer
@@ -182,10 +183,10 @@ describe "Solr" do
     
     describe "not searches" do
       it "finds the correct documents for not nil" do
-        Supernova::Solr.connection.add(:id => "offers/3", :enabled_b => true, :text_t => "Marek Mintal", :popularity_i => 1, 
+        Supernova::Solr.add(:id => "offers/3", :enabled_b => true, :text_t => "Marek Mintal", :popularity_i => 1, 
           :type => "Offer"
         )
-        Supernova::Solr.connection.commit
+        Supernova::Solr.commit!
         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
@@ -261,11 +262,25 @@ describe "Solr" do
   describe "#facets" do
     it "returns the correct facets hash" do
       # pending "fix me"
-      Supernova::Solr.connection.add(:id => "offers/3", :type => "Offer", :user_id_i => 3, :enabled_b => false, 
+      Supernova::Solr.add(:id => "offers/3", :type => "Offer", :user_id_i => 3, :enabled_b => false, 
         :text_t => "Hans Müller", :popularity_i => 10, :type => "Offer"
       )
-      Supernova::Solr.connection.commit
-      new_criteria.facet_fields(:text_t).execute.facets.should == {"text_t"=>{"mintal"=>1, "marek"=>1, "meyer"=>1, "m\303\274ller"=>1, "han"=>2}}
+      Supernova::Solr.commit!
+      new_criteria.facet_fields(:text_t).execute.facets.should == {"text_t"=>{"mintal"=>1, "marek"=>1, "meyer"=>1, "müller"=>1, "han"=>2}}
+    end
+  end
+  
+  describe "#execute_raw" do
+    it "returns a hash" do
+      new_criteria.execute_raw.should be_kind_of(Hash)
+    end
+    
+    it "should not be empty" do
+      new_criteria.execute_raw.keys.should_not be_empty
+    end
+    
+    it "includes th ecorrect headers" do
+      new_criteria.execute_raw.keys.sort.should == %w(responseHeader response).sort
     end
   end
   
@@ -310,7 +325,7 @@ describe "Solr" do
         row3 = { "id" => 3, "location" => "Berlin", "type" => "Offer" }
         row4 = { "id" => 4, "location" => "München", "type" => "Offer" }
         Supernova::Solr.truncate!
-        Supernova::Solr.connection.commit
+        Supernova::Solr.commit!
         @clazz.new.index_rows([row1, row2, row3, row4])
       end
       

data/spec/spec_helper.rb

@@ -25,6 +25,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 RSpec.configure do |config|
   config.before(:each) do
     ActiveRecord::Base.connection.execute("TRUNCATE offers")
+    Supernova::Criteria.mutable_by_default!
   end
 end
 

data/spec/supernova/criteria_spec.rb

@@ -15,6 +15,18 @@ describe "Supernova::Criteria" do
     it "sets the clazz_name" do
       Supernova::Criteria.new(Offer).clazz.should == Offer
     end
+    
+    it "allows setting immutable!" do
+      a = Supernova::Criteria.new
+      a.immutable!
+      a.should be_immutable
+    end
+    
+    it "automatically sets the criteria to immutable when globally enabled" do
+      Supernova::Criteria.immutable_by_default!
+      a = Supernova::Criteria.new
+      a.should be_immutable
+    end
   end
   
   [
@@ -52,7 +64,7 @@ describe "Supernova::Criteria" do
   
   describe "#order" do
     it "sets the order statement" do
-      scope.order("popularity desc").search_options[:order].should == "popularity desc"
+      scope.order("popularity desc").search_options[:order].should == ["popularity desc"]
     end
   end
   
@@ -147,6 +159,7 @@ describe "Supernova::Criteria" do
     
     it "returns the results" do
       res = double("results")
+      scope.stub!(:populate)
       scope.instance_variable_set("@results", res)
       scope.to_a.should == res
     end
@@ -230,6 +243,130 @@ describe "Supernova::Criteria" do
     end
   end
   
+  describe "#clone" do
+    it "returns a new Supernova::Criteria" do
+      Supernova::Criteria.new.clone.should be_kind_of(Supernova::Criteria)
+    end
+    
+    it "also clones the attributes" do
+      a = Supernova::Criteria.new
+      b = a.clone
+      b.immutable?.should == false
+      a.search_options[:a] = 1
+      b.search_options[:a].should be_nil
+    end
+    
+    it "makes the cloned collection immutable" do
+      a = Supernova::Criteria.new
+      a.immutable!
+      b = a.clone
+      b.immutable?.should == true
+    end
+  end
+  
+  describe "#self_or_clone" do
+    it "returns self when immutable is off" do
+      a = Supernova::Criteria.new
+      a.self_or_clone.should == a
+    end
+    
+    it "returns a clone when immutable is on" do
+      a = Supernova::Criteria.new
+      a.immutable!
+      b = a.self_or_clone
+      b.should be_kind_of(Supernova::Criteria)
+      b.should_not == a
+    end
+  end
+  
+  describe "#merge_filters_array" do
+    describe "when mutable" do
+      it "returns self" do
+        a = Supernova::Criteria.new
+        a.merge_filters_array(:a, [1, 2, 3]).should == a
+        a.search_options[:a].should == [1, 2, 3]
+      end
+    end
+    
+    describe "when immutable" do
+      it "returns self" do
+        a = Supernova::Criteria.new
+        a.immutable!
+        b = a.merge_filters_array(:a, [1, 2, 3])
+        b.should_not == a
+        a.search_options[:a].should be_nil
+        b.search_options[:a].should == [1, 2, 3]
+      end
+    end
+  end
+  
+  describe "#without" do
+    describe "when mutable" do
+      it "returns self" do
+        a = Supernova::Criteria.new
+        a.without(:a => 1).should == a
+        a.filters[:without].should == { :a => [1] }
+      end
+    end
+    
+    describe "when immutable" do
+      it "returns self" do
+        a = Supernova::Criteria.new
+        a.immutable!
+        b = a.without(:a => 2)
+        b.should_not == a
+        a.filters[:without].should be_nil
+        b.filters[:without].should == { :a => [2] }
+      end
+    end
+  end
+  
+  
+  describe "#merge_filters_or_search_options" do
+    describe "when mutable" do
+      it "returns self" do
+        a = Supernova::Criteria.new
+        a.merge_filters_or_search_options(:search_options, :per_page, 1).should == a
+        a.search_options[:per_page].should == 1
+      end
+    end
+    
+    describe "when immutable" do
+      it "returns a new criteria" do
+        a = Supernova::Criteria.new
+        a.immutable!
+        b = a.merge_filters_or_search_options(:search_options, :per_page, 3)
+        a.search_options[:per_page].should be_nil
+        b.search_options[:per_page].should == 3
+      end
+    end
+  end
+  
+  describe "#except" do
+    describe "being mutable" do
+      it "returns the criteria" do
+        a = Supernova::Criteria.new
+        a.except(:order).should be_kind_of(Supernova::Criteria)
+      end
+      
+      it "removes the specified field" do
+        a = Supernova::Criteria.new
+        a.order("id").except(:order).search_options[:order].should be_nil
+      end
+    end
+    
+    describe "being immutable" do
+      it "returns a different criteria with the field removed" do
+        a = Supernova::Criteria.new.order("id").where(:a => 1)
+        a.immutable!
+        b = a.except(:order)
+        b.search_options[:order].should be_nil
+        b.filters[:with].should == { :a => 1 }
+        a.search_options[:order].should == ["id"]
+      end
+    end
+  end
+  
   describe "#method_missing" do
     it "raises a no method error when methd not defined" do
       lambda {
@@ -240,7 +377,7 @@ describe "Supernova::Criteria" do
     it "forwards all array methods to @results" do
       results = double("results")
       scope.instance_variable_set("@results", results)
-      results.should_receive(:index, "1")
+      results.should_receive(:index).with("1")
       scope.index("1")
     end
     
@@ -292,10 +429,6 @@ describe "Supernova::Criteria" do
       new_crit.merge(criteria).should == new_crit
     end
     
-    it "merges e.g. the order" do
-      new_crit.merge(criteria).search_options[:order].should == "popularity asc"
-    end
-    
     it "merges e.g. the with filters" do
       new_crit.merge(criteria).filters[:with].should == { :c => 8, :a => 1 }
     end
@@ -333,18 +466,33 @@ describe "Supernova::Criteria" do
     it "calls merge on options" do
       criteria.stub!(:search_options).and_return({ :x => 2, :y => 9 })
       new_crit.stub!(:search_options).and_return({ :z => 3, :c => 1 })
-      new_crit.should_receive(:merge_search_options).with(:x, 2)
-      new_crit.should_receive(:merge_search_options).with(:y, 9)
+      new_crit.should_receive(:merge_search_options).with(:x, 2).and_return(new_crit)
+      new_crit.should_receive(:merge_search_options).with(:y, 9).and_return(new_crit)
       new_crit.merge(criteria)
     end
     
     it "calls merge filters on all filters" do
       criteria.stub!(:filters).and_return({ :a => 1, :c => 3 })
       new_crit.stub!(:filters).and_return({ :b => 2, :e => 1 })
-      new_crit.should_receive(:merge_filters).with(:a, 1)
-      new_crit.should_receive(:merge_filters).with(:c, 3)
+      new_crit.should_receive(:merge_filters).with(:a, 1).and_return(new_crit)
+      new_crit.should_receive(:merge_filters).with(:c, 3).and_return(new_crit)
       new_crit.merge(criteria)
     end
+    
+    describe "when immutable" do
+      it "merges two filters but does not break " do
+        a = Supernova::Criteria.new.with(:a => 1)
+        a.immutable!
+        b = Supernova::Criteria.new.with(:b => 2)
+        b.immutable!
+        c = a.merge(b)
+        c.should_not == a
+        c.should_not == b
+        a.filters[:with].should == { :a => 1 }
+        b.filters[:with].should == { :b => 2 }
+        c.filters[:with].should == { :a => 1, :b => 2 }
+      end
+    end
   end
   
   describe "#near" do

data/spec/supernova/solr_criteria_spec.rb

@@ -3,7 +3,6 @@ require "ostruct"
 
 describe Supernova::SolrCriteria do
   let(:criteria) { Supernova::SolrCriteria.new }
-  let(:rsolr) { double("rsolr").as_null_object }
   let(:docs) do
     [
       {"popularity"=>10, "location"=>"47,11", "text"=>"Hans Meyer", "id"=>"offers/1", "enabled"=>false, "user_id"=>1, "type"=>"Offer"}, 
@@ -16,10 +15,6 @@ describe Supernova::SolrCriteria do
     }
   end
   
-  before(:each) do
-    Supernova::Solr.stub!(:connection).and_return rsolr
-  end
-  
   describe "#fq_from_with" do
     it "returns the correct filter for with ranges" do
       criteria.fq_from_with(:user_id => Range.new(10, 12)).should == ["user_id:[10 TO 12]"]
@@ -63,6 +58,16 @@ describe Supernova::SolrCriteria do
     end
   end
   
+  describe "#convert_search_order" do
+    it "returns a string" do
+      criteria.convert_search_order("title asc").should == "title asc"
+    end
+    
+    it "returns a complex string" do
+      criteria.convert_search_order("title asc, name desc").should == "title asc,name desc"
+    end
+  end
+  
   describe "#to_params" do
     it "returns a Hash" do
       criteria.to_params.should be_an_instance_of(Hash)
@@ -77,13 +82,36 @@ describe Supernova::SolrCriteria do
     end
     
     it "sets the order field" do
-      criteria.order("title").to_params[:sort].should == "title"
+      criteria.order("title asc").to_params[:sort].should == "title asc"
+    end
+    
+    it "allows more complex order fields" do
+      criteria.order("title asc, name desc").to_params[:sort].should == "title asc,name desc"
+    end
+    
+    it "adds raw fields when not able to extract asc or desc" do
+      criteria.order("some_order_func, test asc").to_params[:sort].should == "some_order_func,test asc"
+    end
+    
+    it "chains order statements" do
+      criteria.order("name asc").order("title desc").to_params[:sort].should == "name asc,title desc"
     end
     
     it "uses a mapped field for order" do
-      criteria.attribute_mapping(:title => { :type => :string }).order("title").to_params[:sort].should == "title_s"
+      criteria.attribute_mapping(:title => { :type => :string }).order("title asc").to_params[:sort].should == "title_s asc"
+    end
+    
+    it "allows multi mappings of order criteria when given in one string" do
+      scope = criteria.attribute_mapping(:title => { :type => :string }, :visits => { :type => :integer })
+      scope.order("title asc, visits desc").to_params[:sort].should == "title_s asc,visits_i desc"
     end
     
+    it "allows multi mappings of order criteria when chained" do
+      scope = criteria.attribute_mapping(:title => { :type => :string }, :visits => { :type => :integer })
+      scope.order("title asc").order("visits desc").to_params[:sort].should == "title_s asc,visits_i desc"
+    end
+    
+    
     %w(asc desc).each do |order|
       it "uses a mapped field for order even when #{order} is present" do
         criteria.attribute_mapping(:title => { :type => :string }).order("title #{order}").to_params[:sort].should == "title_s #{order}"
@@ -162,6 +190,10 @@ describe Supernova::SolrCriteria do
       end
     end
     
+    it "allows setting of rows" do
+      criteria.rows(11).to_params[:rows].should == 11
+    end
+    
     describe "pagination" do
       it "sets the correct rows" do
         criteria.paginate(:page => 1, :per_page => 10).to_params[:rows].should == 10
@@ -211,9 +243,10 @@ describe Supernova::SolrCriteria do
   
   describe "#ids" do
     it "sets the select fields to id only" do
-      criteria.should_receive(:select).with("id")
-      criteria.stub!(:execute).and_return([])
-      criteria.ids
+      scope = double("scope")
+      criteria.should_receive(:only_ids).and_return(scope)
+      scope.should_receive(:execute).and_return([])
+      criteria.ids.should == []
     end
     
     it "calls execute" do
@@ -223,16 +256,45 @@ describe Supernova::SolrCriteria do
     
     it "maps the id hashes to ids" do
       criteria.stub(:execute).and_return([ { "id" => "offer/1" }, { "id" => "offer/3" } ])
-      criteria.ids
+      criteria.ids.should == [1, 3]
+    end
+  end
+  
+  describe "#format" do
+    it "sets the correct search_options" do
+      criteria.format("csv").search_options[:wt].should == "csv"
+    end
+    
+    it "includes the format in the params" do
+      criteria.format("csv").to_params[:wt].should == "csv"
+    end
+    
+    it "allows overriding of formats" do
+      criteria.format("csv").format("json").to_params[:wt].should == "json"
     end
   end
+  
+  describe "#only_ids" do
+    it "returns a criteria" do
+      criteria.only_ids.should be_kind_of(Supernova::SolrCriteria)
+    end
+    
+    it "only selects the id column" do
+      a = criteria.select("name_s").only_ids
+      a.to_params[:fl].should == "id"
+    end
+    
+    # it "does something" do
+    #   
+    # end
+  end
 
   describe "#execute" do
-    let(:params) { double("params") }
+    let(:params) { {} }
     
     before(:each) do
+      criteria.stub(:execute_raw).and_return(solr_response)
       criteria.stub(:to_params).and_return params
-      rsolr.stub!(:post).and_return solr_response
     end
     
     it "sets the original response" do
@@ -240,12 +302,7 @@ describe Supernova::SolrCriteria do
     end
     
     it "calls to_params" do
-      criteria.should_receive(:to_params).and_return params
-      criteria.execute
-    end
-    
-    it "calls get with select and params" do
-      rsolr.should_receive(:post).with("select", :data => params).and_return solr_response
+      criteria.should_receive(:execute_raw).and_return solr_response
       criteria.execute
     end
     
@@ -292,7 +349,7 @@ describe Supernova::SolrCriteria do
     end
     
     it "sets the correct facets" do
-      rsolr.stub!(:post).and_return facet_response
+      criteria.stub!(:execute_raw).and_return(facet_response)
       criteria.should_receive(:hashify_facets_from_response).with(facet_response).and_return({ :a => 1 })
       criteria.execute.facets.should == {:a => 1}
     end