supernova 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/supernova/solr.rb

@@ -1,5 +1,4 @@
 require "supernova/solr_criteria"
-require "supernova/solr_indexer"
 
 module Supernova::Solr
   class << self
@@ -18,4 +17,6 @@ module Supernova::Solr
     base.extend(Supernova::ClassMethods)
     base.criteria_class = Supernova::SolrCriteria
   end
-end
+end
+
+require "supernova/solr_indexer"

data/lib/supernova/solr_indexer.rb

@@ -4,6 +4,8 @@ class Supernova::SolrIndexer
   attr_accessor :options, :db, :ids
   attr_writer :index_file_path
   
+  include Supernova::Solr
+  
   class << self
     def field_definitions
       @field_definitions ||= {}
@@ -24,13 +26,16 @@ class Supernova::SolrIndexer
     end
     
     def method_missing(*args)
-      criteria = Supernova::SolrCriteria.new(self.clazz).attribute_mapping(self.field_definitions)
-      if criteria.respond_to?(args.first)
-        criteria.send(*args)
+      if search_scope.respond_to?(args.first)
+        search_scope.send(*args)
       else
         super
       end
     end
+    
+    def search_scope
+      Supernova::SolrCriteria.new(self.clazz).attribute_mapping(self.field_definitions)
+    end
   end
   
   FIELD_SUFFIX_MAPPING = {

data/spec/integration/thinking_sphinx_spec.rb

@@ -23,7 +23,7 @@ describe "ThinkingSphinx" do
     @offer1 = Offer.create!(:id => 1, :user_id => 1, :enabled => false, :text => "Hans Meyer", :popularity => 10, :lat => root.lat, :lng => root.lng)
     @offer2 = Offer.create!(:id => 2, :user_id => 2, :enabled => true, :text => "Marek Mintal", :popularity => 1, :lat => endpoint.lat, :lng => endpoint.lng)
     ts.controller.index
-    sleep 0.2
+    sleep 0.3
   end
   
   it "finds the correct objects" do

data/spec/supernova/solr_indexer_spec.rb

@@ -417,6 +417,24 @@ describe Supernova::SolrIndexer do
     end
   end
   
+  describe "#named_search_scope" do
+    it "returns the correct scope" do
+      indexer_clazz.named_search_scope :published 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}
+      }
+    end
+    
+    it "works with attribute mappings" do
+      indexer_clazz.named_search_scope :with_title do
+        where(:title.ne => nil)
+      end
+      indexer_clazz.with_title.to_params[:fq].should include("title_t:[* TO *]")
+    end
+  end
+  
   describe "#solr_field_for_field_name_and_mapping" do
     let(:mapping) do 
       { 

data/supernova.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   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: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Tobias Schwab