supernova 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/supernova.rb

@@ -10,7 +10,7 @@ module Supernova
     attr_accessor :criteria_class, :defined_named_search_scopes
     
     def search_scope
-      self.criteria_class.new(self)
+      self.criteria_class.new(self).named_scope_class(self)
     end
     
     def named_search_scope(name, &block)

data/lib/supernova/criteria.rb

@@ -170,13 +170,17 @@ class Supernova::Criteria
     if args.length == 1 && Array.new.respond_to?(args.first)
       to_a.send(args.first, &block)
     elsif self.named_scope_defined?(args.first)
-      self.merge(self.clazz.send(*args)) # merge named scope and current criteria
+      self.merge(self.search_options[:named_scope_class].send(*args)) # merge named scope and current criteria
     else
       super
     end
   end
   
+  def named_scope_class(clazz)
+    merge_search_options :named_scope_class, clazz
+  end
+  
   def named_scope_defined?(name)
-    self.clazz && self.clazz.respond_to?(:defined_named_search_scopes) && clazz.defined_named_search_scopes.respond_to?(:include?) && clazz.defined_named_search_scopes.include?(name)
+    self.search_options[:named_scope_class] && self.search_options[:named_scope_class].respond_to?(:defined_named_search_scopes) && self.search_options[:named_scope_class].defined_named_search_scopes.respond_to?(:include?) && self.search_options[:named_scope_class].defined_named_search_scopes.include?(name)
   end
 end

data/lib/supernova/solr_indexer.rb

@@ -34,7 +34,7 @@ class Supernova::SolrIndexer
     end
     
     def search_scope
-      Supernova::SolrCriteria.new(self.clazz).attribute_mapping(self.field_definitions)
+      Supernova::SolrCriteria.new(self.clazz).attribute_mapping(self.field_definitions).named_scope_class(self)
     end
   end
   

data/spec/supernova/criteria_spec.rb

@@ -169,7 +169,7 @@ describe "Supernova::Criteria" do
     
     it "it calls merge with self and returned scope" do
       clazz = double("clazz")
-      scope = Supernova::Criteria.new(clazz)
+      scope = Supernova::Criteria.new.named_scope_class(clazz)
       scope.stub(:named_scope_defined?).and_return true
       rge_scope = double("rgne_scope")
       scope_ret = double("ret")
@@ -195,6 +195,10 @@ 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") }
@@ -219,6 +223,24 @@ describe "Supernova::Criteria" do
       new_crit.merge(criteria).search_options[:search].should == ["New Search"]
     end
     
+    it "correctly merges the named_scope_class" do
+      new_crit.named_scope_class(String)
+      new_crit.merge(criteria).search_options[:named_scope_class].should == String
+    end
+    
+    it "correctly merges the attribute_mapping" do
+      mapping = { :title => { :type => :string } }
+      new_crit.attribute_mapping(mapping)
+      new_crit.merge(criteria).search_options[:attribute_mapping].should == mapping
+    end
+    
+    it "uses the base attributes_mapping when " do
+      mapping = { :title => { :type => :string }, :artist_name => { :type => :string } }
+      other = Supernova::SolrCriteria.new.with(:artist_name => "name")
+      Supernova::SolrCriteria.new.attribute_mapping(mapping).with(:title => "test").merge(other).to_params[:fq].should include("artist_name_s:name")
+      Supernova::SolrCriteria.new.attribute_mapping(mapping).with(:title => "test").merge(other).to_params[:fq].should include("title_s:test")
+    end
+    
     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 })
@@ -293,7 +315,7 @@ describe "Supernova::Criteria" do
         attr_accessor :defined_named_search_scopes
       end
       clazz.defined_named_search_scopes = nil
-      Supernova::Criteria.new(clazz).should_not be_named_scope_defined(:rgne)
+      Supernova::Criteria.new.named_scope_class(clazz).should_not be_named_scope_defined(:rgne)
     end
     
     it "returns false when clazz is responding to defined_search_scopes but not included" do
@@ -302,7 +324,7 @@ describe "Supernova::Criteria" do
         attr_accessor :defined_named_search_scopes
       end
       clazz.defined_named_search_scopes = [:some_other]
-      Supernova::Criteria.new(clazz).should_not be_named_scope_defined(:rgne)
+      Supernova::Criteria.new.named_scope_class(clazz).should_not be_named_scope_defined(:rgne)
     end
     
     it "returns true when clazz is responding to defined_search_scopes and included" do
@@ -311,7 +333,13 @@ describe "Supernova::Criteria" do
         attr_accessor :defined_named_search_scopes
       end
       clazz.defined_named_search_scopes = [:rgne]
-      Supernova::Criteria.new(clazz).should be_named_scope_defined(:rgne)
+      Supernova::Criteria.new.named_scope_class(clazz).should be_named_scope_defined(:rgne)
+    end
+  end
+  
+  describe "#named_scope_class" do
+    it "sets the named_scope_class search_option" do
+      Supernova::Criteria.new.named_scope_class(String).search_options[:named_scope_class].should == String
     end
   end
 end

data/spec/supernova/solr_indexer_spec.rb

@@ -433,6 +433,19 @@ describe Supernova::SolrIndexer do
       end
       indexer_clazz.with_title.to_params[:fq].should include("title_t:[* TO *]")
     end
+    
+    it "allows chaining of named scopes" do
+      indexer_clazz.named_search_scope :with_title do
+        where(:title.ne => nil)
+      end
+      
+      indexer_clazz.named_search_scope :with_description do
+        where(:description.ne => nil)
+      end
+      fqs = indexer_clazz.with_description.with_title.to_params[:fq]
+      fqs.should include("description_t:[* TO *]")
+      fqs.should include("title_t:[* TO *]")
+    end
   end
   
   describe "#solr_field_for_field_name_and_mapping" do

data/spec/supernova_spec.rb

@@ -58,7 +58,7 @@ describe Supernova do
     
     describe "chaining" do
       it "calls merge with both scopes" do
-        scope = Supernova::ThinkingSphinxCriteria.new(clazz)
+        scope = Supernova::ThinkingSphinxCriteria.new(clazz).named_scope_class(clazz)
         scope.should_receive(:merge).with(instance_of(Supernova::ThinkingSphinxCriteria))
         scope.popular
       end

data/supernova.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Tobias Schwab