supernova 0.4.14 → 0.4.15

data/VERSION

@@ -1 +1 @@
-0.4.14
+0.4.15

data/lib/supernova/solr_criteria.rb

@@ -73,7 +73,21 @@ class Supernova::SolrCriteria < Supernova::Criteria
   end
   
   def fq_filter_for_key_and_value(key, value)
-    "#{key}:#{value.is_a?(Range) ? "[#{value.first} TO #{value.last}]" : value}"
+    if value.nil?
+      "!#{key}:[* TO *]"
+    elsif value.is_a?(Range)
+      "#{key}:[#{value_for_fq_filter(value.first)} TO #{value_for_fq_filter(value.last)}]"
+    else
+      "#{key}:#{value_for_fq_filter(value)}"
+    end
+  end
+  
+  def value_for_fq_filter(value)
+    if value.is_a?(Date)
+      Time.utc(value.year, value.month, value.day).iso8601
+    else
+      value
+    end
   end
   
   def build_docs(docs)

data/lib/supernova/solr_indexer.rb

@@ -1,9 +1,10 @@
 require "json"
 require "fileutils"
+require "time"
 
 class Supernova::SolrIndexer
   attr_accessor :options, :db, :ids, :max_rows_to_direct_index, :local_solr
-  attr_writer :index_file_path
+  attr_writer :index_file_path, :debug
   
   MAX_ROWS_TO_DIRECT_INDEX = 100
   
@@ -70,6 +71,17 @@ class Supernova::SolrIndexer
     self.ids ||= :all
   end
   
+  def debug(message)
+    response = true
+    time = Benchmark.realtime do
+      response = yield if block_given?
+    end
+    if @debug == true
+      puts "%s: %s" % [Time.now.iso8601(3), message.gsub("%TIME%", "%.3f" % time)]
+    end
+    response
+  end
+  
   def index!
     index_query(query_to_index)
   end
@@ -99,7 +111,7 @@ class Supernova::SolrIndexer
         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 
+          value = value.utc.iso8601 if value
         end
         hash["#{field}_#{self.class.suffix_from_type(options[:type])}"] = value
       end
@@ -171,7 +183,15 @@ class Supernova::SolrIndexer
   end
   
   def query_db(query)
-    db.send(db.respond_to?(:query) ? :query : :select_all, query)
+    if db.respond_to?(:query)
+      db.query(query, :as => :hash)
+    else
+      db.select_all(query)
+    end
+  end
+  
+  def rows(query = nil)
+    query_db(query || query_to_index)
   end
   
   def solr_rows_to_index_for_query(query)
@@ -181,24 +201,33 @@ class Supernova::SolrIndexer
   end
   
   def index_query(query)
-    rows = solr_rows_to_index_for_query(query)
+    debug "getting rows for #{query[0,100]}"
+    rows = debug "got all rows in %TIME%" do
+      solr_rows_to_index_for_query(query)
+    end
     if self.max_rows_to_direct_index < rows.count
-      index_with_json_file(rows)
+      debug "indexed #{rows.length} rows with json in %TIME%" do
+        index_with_json_file(rows)
+      end
     else
-      index_directly(rows)
+      debug "indexed #{rows.length} rows directly in %TIME%" do
+        index_directly(rows)
+      end
     end
   end
   
-  def index_directly(rows, &block)
+  def index_directly(rows)
     rows.each do |row|
       row = Supernova::Solr.connection.add(row)
     end
     Supernova::Solr.connection.commit if rows.any?
   end
   
-  def index_with_json_file(rows, &block)
-    rows.each do |row|
-      write_to_file(row)
+  def index_with_json_file(rows)
+    debug "wrote #{rows.count} rows to the json file in %TIME%" do
+      rows.each do |row|
+        write_to_file(row)
+      end
     end
     finish
   end

data/spec/supernova/solr_criteria_spec.rb

@@ -30,6 +30,31 @@ describe Supernova::SolrCriteria do
     end
   end
   
+  describe "#fq_filter_for_key_and_value" do
+    it "returns the correct statment for nil" do
+      criteria.fq_filter_for_key_and_value(:user_id, nil).should == "!user_id:[* TO *]"
+    end
+    
+    it "returns the correct conditon for single values" do
+      criteria.fq_filter_for_key_and_value(:user_id, 1).should == "user_id:1"
+    end
+    
+    it "returns the correct condition for ranges" do
+      criteria.fq_filter_for_key_and_value(:user_id, 1..10).should == "user_id:[1 TO 10]"
+    end
+    
+    it "returns the correct conditon for single dates" do
+      criteria.fq_filter_for_key_and_value(:released_on, Date.new(1999, 1, 2)).should == "released_on:1999-01-02T00:00:00Z"
+    end
+    
+    it "returns the correct condition for date ranges" do
+      date1 = Date.new(1999, 1, 2)
+      date2 = Date.new(1999, 2, 5)
+      range = Range.new(date1, date2)
+      criteria.fq_filter_for_key_and_value(:open_at, range).should == "open_at:[1999-01-02T00:00:00Z TO 1999-02-05T00:00:00Z]"
+    end
+  end
+  
   describe "#to_params" do
     it "returns a Hash" do
       criteria.to_params.should be_an_instance_of(Hash)

data/spec/supernova/solr_indexer_spec.rb

@@ -183,7 +183,7 @@ describe Supernova::SolrIndexer do
   
   describe "#query_db" do
     it "executes the query" do
-      db.should_receive(:query).with("query").and_return [to_index]
+      db.should_receive(:query).with("query", :as => :hash).and_return [to_index]
       indexer.query_db("query")
     end
     
@@ -195,6 +195,38 @@ describe Supernova::SolrIndexer do
     end
   end
   
+  describe "#debug" do
+    it "prints a line when debug is enabled" do
+      index = CustomSolrIndex.new(:debug => true)
+      index.should_receive(:puts).with(/hello world/)
+      index.debug "hello world"
+    end
+    
+    it "does not print print a line when debug is not enabled" do
+      index = CustomSolrIndex.new(:debug => false)
+      index.should_not_receive(:puts)
+      index.debug "hello world"
+    end
+    
+    it "can be called with block and still returns the response" do
+      index = CustomSolrIndex.new(:debug => true)
+      index.should_receive(:puts).with(/some message/)
+      res = index.debug "some message" do
+        112
+      end
+      res.should == 112
+    end
+    
+    it "includes the time in the debug output when placeholder found" do
+      index = CustomSolrIndex.new(:debug => true)
+      Benchmark.stub(:realtime).and_return 0.12345
+      index.should_receive(:puts).with(/indexed in 0.123/)
+      index.debug "indexed in %TIME%" do
+        112
+      end
+    end
+  end
+  
   describe "#map_hash_keys_to_solr" do
     class CustomSolrIndex < Supernova::SolrIndexer
       has :offer_id, :type => :integer
@@ -205,6 +237,10 @@ describe Supernova::SolrIndexer do
       has :indexed, :type => :boolean, :virtual => true
     end
     
+    it "sets empty dates to nil" do
+      CustomSolrIndex.new.map_hash_keys_to_solr("checkin_date" => nil)["checkin_date_dt"].should == nil
+    end
+    
     it "maps virtual fields" do
       CustomSolrIndex.new.map_hash_keys_to_solr("indexed" => true)["indexed_b"].should == true
     end
@@ -254,6 +290,25 @@ describe Supernova::SolrIndexer do
     end
   end
   
+  describe "#rows" do
+    let(:res) { double("result") }
+    
+    before(:each) do
+      custom_indexer.stub(:query_db).and_return([])
+    end
+    
+    it "calls query_db with correct query" do
+      custom_indexer.should_receive(:query_db).with("some query").and_return res
+      custom_indexer.rows("some query").should == res
+    end
+    
+    it "uses the query_to_index when query is blank" do
+      custom_indexer.should_receive(:query_to_index).and_return "some other query"
+      custom_indexer.should_receive(:query_db).with("some other query").and_return res
+      custom_indexer.rows.should == res
+    end
+  end
+  
   describe "#solr_rows_to_index_for_query" do
     let(:result) {
       [

data/supernova.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.4.14"
+  s.version = "0.4.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-07-27}
+  s.date = %q{2011-07-28}
   s.description = %q{Unified search scopes}
   s.email = %q{tobias.schwab@dynport.de}
   s.executables = ["start_solr"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 4
-  - 14
-  version: 0.4.14
+  - 15
+  version: 0.4.15
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-27 00:00:00 Z
+date: 2011-07-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement