supernova 0.7.1 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/supernova/collection.rb

@@ -1,5 +1,24 @@
 require "will_paginate"
 
 class Supernova::Collection < WillPaginate::Collection
-  attr_accessor :original_response, :facets
+  attr_accessor :original_response, :facets, :original_criteria
+  
+  def raw_facet_queries
+    raw_facet_counts["facet_queries"] || {}
+  end
+  
+  def raw_facet_counts
+    original_response["facet_counts"] || {}
+  end
+  
+  def facet_queries
+    @facet_queries ||= raw_facet_queries.inject({}) do |hash, (raw_query, count)|
+      hash[original_facet_queries.invert[raw_query]] = count
+      hash
+    end
+  end
+  
+  def original_facet_queries
+    original_criteria.search_options[:facet_queries] || {}
+  end
 end

data/lib/supernova/criteria.rb

@@ -95,6 +95,10 @@ class Supernova::Criteria
   def facet_fields(*fields)
     merge_filters_array :facets, fields
   end
+  
+  def facet_queries(hash)
+    merge_search_options :facet_queries, hash
+  end
 
   def conditions(filters)
     merge_filters :conditions, filters

data/lib/supernova/solr_criteria.rb

@@ -28,11 +28,15 @@ class Supernova::SolrCriteria < Supernova::Criteria
     end
     solr_options[:fq] << "type:#{self.clazz}" if self.clazz
     
+    solr_options[:facet] = true if include_facets?
     if self.search_options[:facets]
-      solr_options[:facet] = true
       solr_options["facet.field"] = self.search_options[:facets].compact.map { |field| solr_field_from_field(field) }
     end
     
+    if self.search_options[:facet_queries]
+      solr_options["facet.query"] = self.search_options[:facet_queries].values
+    end
+    
     if self.search_options[:pagination] || search_options[:rows] || search_options[:start]
       solr_options[:rows] = self.search_options[:rows] || per_page
       solr_options[:start] = search_options[:start] || ((current_page - 1) * solr_options[:rows])
@@ -40,6 +44,10 @@ class Supernova::SolrCriteria < Supernova::Criteria
     solr_options
   end
   
+  def include_facets?
+    self.search_options[:facets] || self.search_options[:facet_queries]
+  end
+  
   def convert_search_order(order)
     order.split(/\s*,\s*/).map do |chunk|
       if chunk.match(/(.*?) (asc|desc)/i)
@@ -184,6 +192,7 @@ class Supernova::SolrCriteria < Supernova::Criteria
   def execute
     response = execute_raw
     collection = Supernova::Collection.new(current_page, per_page == 0 ? 1 : per_page, response["response"]["numFound"])
+    collection.original_criteria = self.clone
     collection.original_response = response
     collection.facets = hashify_facets_from_response(response)
     collection.replace(build_docs(response["response"]["docs"]))

data/spec/integration/solr_spec.rb

@@ -261,7 +261,6 @@ describe "Solr" do
   
   describe "#facets" do
     it "returns the correct facets hash" do
-      # pending "fix me"
       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"
       )
@@ -270,6 +269,20 @@ describe "Solr" do
     end
   end
   
+  describe "#facet_queries" do
+    it "returns the correct result" do
+      defaults = {
+        
+      }
+      Supernova::Solr.add(:id => "offers/1", :type => "Offer", :popularity_i => 1)
+      Supernova::Solr.add(:id => "offers/2", :type => "Offer", :popularity_i => 10)
+      Supernova::Solr.add(:id => "offers/3", :type => "Offer", :popularity_i => 100)
+      Supernova::Solr.commit!
+      col = new_criteria.facet_queries(:one => "popularity_i:[* TO 1]", :ten => "popularity_i:[* TO 10]", :hundred => "popularity_i:[* TO 100]").execute
+      col.facet_queries.should == { :one => 1, :ten => 2, :hundred => 3 }
+    end
+  end
+  
   describe "#execute_raw" do
     it "returns a hash" do
       new_criteria.execute_raw.should be_kind_of(Hash)
@@ -305,7 +318,9 @@ describe "Solr" do
   
   describe "with mapping" do
     before(:each) do
-      @clazz = Class.new(Supernova::SolrIndexer)
+      name = "Class#{Time.now.to_f.to_s.gsub(".", "")}"
+      eval("class #{name} < Supernova::SolrIndexer; end")
+      @clazz = name.constantize
       @clazz.has :location, :type => :string
       @clazz.has :city, :type => :string
     end

data/spec/supernova/collection_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+describe "Supernova::Collection" do
+  let(:col) { Supernova::Collection.new(1, 10, 100) }
+  
+  let(:original_response_with_facets) do
+    {"responseHeader"=>{"status"=>0, "QTime"=>2, "params"=>{"facet"=>"true", "wt"=>"json", "facet.query"=>["popularity_i:[* TO 1]", "popularity_i:[* TO 10]", "popularity_i:[* TO 100]"], "fq"=>"type:Offer", "q"=>"*:*"}}, "response"=>{"numFound"=>3, "start"=>0, "docs"=>[{"id"=>"offers/1", "type"=>"Offer", "popularity_i"=>1}, {"id"=>"offers/2", "type"=>"Offer", "popularity_i"=>10}, {"id"=>"offers/3", "type"=>"Offer", "popularity_i"=>100}]}, "facet_counts"=>{"facet_queries"=>{"popularity_i:[* TO 1]"=>1, "popularity_i:[* TO 10]"=>2, "popularity_i:[* TO 100]"=>3}, "facet_fields"=>{}, "facet_dates"=>{}, "facet_ranges"=>{}}}
+  end
+    
+  let(:original_response_without_facets) do
+    {"responseHeader"=>{"status"=>0, "QTime"=>0, "params"=>{"wt"=>"json", "fq"=>"type:Offer", "q"=>"*:*"}}, "response"=>{"numFound"=>3, "start"=>0, "docs"=>[{"id"=>"offers/1", "type"=>"Offer", "popularity_i"=>1}, {"id"=>"offers/2", "type"=>"Offer", "popularity_i"=>10}, {"id"=>"offers/3", "type"=>"Offer", "popularity_i"=>100}]}}
+    {:one=>1, :ten=>2, :hundred=>3}
+  end
+  
+  describe "#raw_facet_queries" do
+
+    
+    it "returns the correct facet queries when found" do
+      col.original_response = original_response_with_facets
+      col.raw_facet_queries.should == { "popularity_i:[* TO 1]"=>1, "popularity_i:[* TO 10]"=>2, "popularity_i:[* TO 100]"=>3 }
+    end
+    
+    it "returns an empty hash when facet_queries is empty" do
+      col.original_response = original_response_without_facets
+      col.raw_facet_queries.should == {}
+    end
+  end
+  
+  describe "#facet_queries" do
+    it "returns the correct hash" do
+      crit = Supernova::Criteria.facet_queries(:one => "popularity_i:[* TO 1]", :ten => "popularity_i:[* TO 10]", :hundred => "popularity_i:[* TO 100]")
+      col.original_criteria = crit
+      col.original_response = original_response_with_facets
+      col.facet_queries.should == { :one => 1, :ten => 2, :hundred => 3 }
+    end
+  end
+  
+  describe "#original_facet_queries" do
+    it "returns the correct hash when facet queries activated" do
+      queries = { :one => "popularity_i:[* TO 1]", :ten => "popularity_i:[* TO 10]", :hundred => "popularity_i:[* TO 100]" }
+      col.original_criteria = Supernova::Criteria.facet_queries(queries)
+      col.original_facet_queries.should == queries
+    end
+    
+    it "returns an empty hash when not defined" do
+      col.original_criteria = Supernova::Criteria.new
+      col.original_facet_queries.should == {}
+    end
+  end
+end

data/spec/supernova/criteria_spec.rb

@@ -437,6 +437,23 @@ describe "Supernova::Criteria" do
     scope.start(99).search_options[:start].should == 99
   end
   
+  describe "#facet_queries" do
+    it "adds the queries to the facet_queries array" do
+      scope.facet_queries(:first => "1 = 1").facet_queries(:second => "2 = 2").search_options[:facet_queries].should == {
+        :first => "1 = 1", :second => "2 = 2"
+      }
+    end
+    
+    it "allows merging of two scopes with facet queries" do
+      scope.immutable!
+      a = scope.facet_queries(:first => "1 = 1")
+      b = scope.facet_queries(:second => "2 = 2")
+      a.search_options[:facet_queries].should == { :first => "1 = 1" }
+      b.search_options[:facet_queries].should == { :second => "2 = 2" }
+      a.merge(b).search_options[:facet_queries].should == { :first => "1 = 1", :second => "2 = 2" }
+    end
+  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

@@ -152,14 +152,29 @@ describe "Supernova::SolrCriteria" do
       criteria.select(:user_id).select(:user_id).select(:enabled).to_params[:fl].should == "user_id,enabled,id"
     end
     
-    it "sets the correct facet options when set" do
-      params = criteria.facet_fields(:name).to_params
-      params[:facet].should == true
+    describe "with facet fields" do
+      it "sets the correct facet options when set" do
+        params = criteria.facet_fields(:name).to_params
+        params[:facet].should == true
+      end
+    
+      it "sets all facet fields" do
+        params = criteria.facet_fields(:name).facet_fields(:title).to_params
+        params["facet.field"].should == ["name", "title"]
+      end
     end
     
-    it "sets all facet fields" do
-      params = criteria.facet_fields(:name).facet_fields(:title).to_params
-      params["facet.field"].should == ["name", "title"]
+    describe "with facet queries", :wip => true do
+      let(:params) { criteria.facet_queries(:a => "a", :b => "b").to_params }
+      
+      it "sets :facet to true" do
+        params[:facet].should == true
+      end
+      
+      it "sets the correct facet query field" do
+        criteria.facet_queries(:a => "a", :b => "b")
+        params["facet.query"].should == ["a", "b"]
+      end
     end
     
     it "uses mapped fields for select" do
@@ -219,7 +234,6 @@ describe "Supernova::SolrCriteria" do
       it "overwrites pagination with start" do
         criteria.paginate(:per_page => 9, :page => 1).start(100).rows(11).to_params[:start].should == 100
       end
-      
     end
     
     describe "pagination" do
@@ -368,7 +382,7 @@ describe "Supernova::SolrCriteria" do
     end
     
     it "calls replace on collection with returned docs" do
-      col = double("collection", :original_response= => true, :facets= => true)
+      col = Supernova::Collection.new(1, 1, 10)
       Supernova::Collection.stub!(:new).and_return col
       built_docs = double("built docs")
       criteria.stub!(:build_docs).and_return built_docs

data/supernova.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "supernova"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
@@ -81,6 +81,7 @@ Gem::Specification.new do |s|
     "spec/database.sql",
     "spec/integration/solr_spec.rb",
     "spec/spec_helper.rb",
+    "spec/supernova/collection_spec.rb",
     "spec/supernova/condition_spec.rb",
     "spec/supernova/criteria_spec.rb",
     "spec/supernova/numeric_extensions_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: supernova
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70247180583600 !ruby/object:Gem::Requirement
+  requirement: &70321781020900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247180583600
+  version_requirements: *70321781020900
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70247180583100 !ruby/object:Gem::Requirement
+  requirement: &70321781018320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247180583100
+  version_requirements: *70321781018320
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70247180582600 !ruby/object:Gem::Requirement
+  requirement: &70321781016320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247180582600
+  version_requirements: *70321781016320
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70247180582120 !ruby/object:Gem::Requirement
+  requirement: &70321781013260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70247180582120
+  version_requirements: *70321781013260
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70247180581640 !ruby/object:Gem::Requirement
+  requirement: &70321781011320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247180581640
+  version_requirements: *70321781011320
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70247180581080 !ruby/object:Gem::Requirement
+  requirement: &70321781008720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70247180581080
+  version_requirements: *70321781008720
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70247180580560 !ruby/object:Gem::Requirement
+  requirement: &70321781006600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247180580560
+  version_requirements: *70321781006600
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70247180580080 !ruby/object:Gem::Requirement
+  requirement: &70321781004800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.2.18
   type: :development
   prerelease: false
-  version_requirements: *70247180580080
+  version_requirements: *70321781004800
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70247180579600 !ruby/object:Gem::Requirement
+  requirement: &70321781003700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *70247180579600
+  version_requirements: *70321781003700
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &70247180579080 !ruby/object:Gem::Requirement
+  requirement: &70321781002640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247180579080
+  version_requirements: *70321781002640
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70247180578600 !ruby/object:Gem::Requirement
+  requirement: &70321781001180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247180578600
+  version_requirements: *70321781001180
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70247180578120 !ruby/object:Gem::Requirement
+  requirement: &70321780999760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247180578120
+  version_requirements: *70321780999760
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70247180577640 !ruby/object:Gem::Requirement
+  requirement: &70321780997780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247180577640
+  version_requirements: *70321780997780
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &70247180577140 !ruby/object:Gem::Requirement
+  requirement: &70321780996620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247180577140
+  version_requirements: *70321780996620
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70247180576640 !ruby/object:Gem::Requirement
+  requirement: &70321780995300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247180576640
+  version_requirements: *70321780995300
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70247180533280 !ruby/object:Gem::Requirement
+  requirement: &70321780993280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247180533280
+  version_requirements: *70321780993280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70247180532680 !ruby/object:Gem::Requirement
+  requirement: &70321780989420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70247180532680
+  version_requirements: *70321780989420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70247180532080 !ruby/object:Gem::Requirement
+  requirement: &70321780987880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70247180532080
+  version_requirements: *70321780987880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70247180531500 !ruby/object:Gem::Requirement
+  requirement: &70321780986040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *70247180531500
+  version_requirements: *70321780986040
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70247180530900 !ruby/object:Gem::Requirement
+  requirement: &70321780983540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,7 +230,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247180530900
+  version_requirements: *70321780983540
 description: Unified search scopes
 email: tobias.schwab@dynport.de
 executables:
@@ -303,6 +303,7 @@ files:
 - spec/database.sql
 - spec/integration/solr_spec.rb
 - spec/spec_helper.rb
+- spec/supernova/collection_spec.rb
 - spec/supernova/condition_spec.rb
 - spec/supernova/criteria_spec.rb
 - spec/supernova/numeric_extensions_spec.rb
@@ -327,7 +328,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2690249885197212135
+      hash: 1961663635880777214
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: