supernova 0.2.1 → 0.2.2

data/spec/integration/solr_spec.rb

@@ -94,5 +94,11 @@ describe "Solr" do
       results.total_entries.should == 0
       results.current_page.should == 1
     end
+    
+    it "only sets specific attributes" do
+      results = new_criteria.select(:user_id).with(:user_id => 1).to_a
+      results.length.should == 1
+      results.first.should == { "id" => "offers/1", "user_id" => 1 }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -40,7 +40,7 @@ ThinkingSphinx::ActiveRecord::LogSubscriber.logger = Logger.new(
 
 ActiveRecord::Base.send(:include, ThinkingSphinx::ActiveRecord)
 
-ActiveRecord::Base.connection.execute("DROP TABLE offers")
+ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS offers")
 ActiveRecord::Base.connection.execute("CREATE TABLE offers (id SERIAL, text TEXT, user_id INTEGER, enabled BOOLEAN, popularity INTEGER, lat FLOAT, lng FLOAT)")
 
 class Offer < ActiveRecord::Base

data/spec/supernova/solr_criteria_spec.rb

@@ -48,6 +48,10 @@ describe Supernova::SolrCriteria do
       criteria.to_params[:fq].should == []
     end
     
+    it "sets the correct select filters when present" do
+      criteria.select(:user_id).select(:user_id).select(:enabled).to_params[:fl].should == "user_id,enabled,id"
+    end
+    
     it "adds all without filters" do
       criteria.without(:user_id => 1).to_params[:fq].should == ["!user_id:1"]
       criteria.without(:user_id => 1).without(:user_id => 1).without(:user_id => 2).to_params[:fq].sort.should == ["!user_id:1", "!user_id:2"]
@@ -175,6 +179,12 @@ describe Supernova::SolrCriteria do
       criteria.should_receive(:build_doc).with(doc2)
       criteria.build_docs(docs)
     end
+    
+    it "uses a custom mapper when build_doc_method is set" do
+      doc1 = { "a" => 1 }
+      meth = lambda { |row| row.to_a }
+      criteria.build_doc_method(meth).build_docs([doc1]).should == [[["a", 1]]]
+    end
   end
   
   describe "#build_doc" do
@@ -206,6 +216,12 @@ describe Supernova::SolrCriteria do
     it "would also work with mongoid ids" do
       criteria.build_doc("type" => "MongoOffer", "id" => "offers/4df08c30f3b0a72e7c227a55").id.should == "4df08c30f3b0a72e7c227a55"
     end
+    
+    it "uses OpenStruct when type is not given" do
+      doc = criteria.build_doc("id" => "offers/4df08c30f3b0a72e7c227a55")
+      doc.should be_an_instance_of(Hash)
+      doc["id"].should == "offers/4df08c30f3b0a72e7c227a55"
+    end
   end
   
   describe "#current_page" do

data/spec/supernova/solr_indexer_spec.rb

@@ -0,0 +1,167 @@
+require "spec_helper"
+
+describe Supernova::SolrIndexer do
+  
+  let(:db) { double("db", :query => [to_index]) }
+  let(:to_index) { { :id => 1, :title => "Some Title"} }
+  let(:file_stub) { double("file").as_null_object }
+  
+  let(:indexer) {
+    indexer = Supernova::SolrIndexer.new
+    indexer.db = db
+    Supernova::Solr.url = "http://solr.xx:9333/solr"
+    indexer.stub!(:system).and_return true
+    indexer
+  }
+  
+  before(:each) do
+    File.stub!(:open).and_return file_stub
+  end
+  
+  describe "initialize" do
+    it "sets all options" do
+      options = { :database => { :database => "dynasty", :username => "dynasty_user" } }
+      indexer = Supernova::SolrIndexer.new(options)
+      indexer.options.should == options
+    end
+    
+    it "sets all known attributes" do
+      indexer = Supernova::SolrIndexer.new(:db => db)
+      indexer.db.should == db
+    end
+  end
+  
+  describe "#query_db" do
+    it "executes the query" do
+      db.should_receive(:query).with("query").and_return [to_index]
+      indexer.query_db("query")
+    end
+    
+    it "calls select_all when not responding to query" do
+      old_mysql_double = double("old mysql double", :select_all => [])
+      indexer.db = old_mysql_double
+      old_mysql_double.should_receive(:select_all).with("query").and_return [to_index]
+      indexer.query_db("query")
+    end
+  end
+  
+  describe "#index_query" do
+    let(:query) { %(SELECT CONCAT("user_", id) AS id, title FROM people WHERE type = 'User') }
+    
+    it "executes the query" do
+      indexer.should_receive(:query_db).with(query).and_return [to_index]
+      indexer.index_query(query)
+    end
+    
+    it "calls write_to_file on all rows" do
+      rows = [double("1"), double("2")]
+      indexer.stub(:query_db).and_return rows
+      indexer.should_receive(:write_to_file).with(rows.first)
+      indexer.should_receive(:write_to_file).with(rows.at(1))
+      indexer.stub!(:finish)
+      indexer.index_query(query)
+    end
+    
+    it "calls finish" do
+      indexer.should_receive(:finish)
+      indexer.index_query(query)
+    end
+  end
+  
+  describe "#index_file_path" do
+    it "returns the set file_path" do
+      indexer.index_file_path = "/some/path"
+      indexer.index_file_path.should == "/some/path"
+    end
+    
+    it "returns a random file path when not set" do
+      Time.stub(:now).and_return Time.at(112233)
+      indexer.index_file_path.should == "/tmp/index_file_112233.json"
+    end
+  end
+  
+  describe "#write_to_file" do
+    describe "with the stream not being open" do
+      it "opens a new stream" do
+        indexer.index_file_path = "/tmp/some_path.json"
+        File.should_receive(:open).with("/tmp/some_path.json", "w")
+        indexer.write_to_file(to_index)
+      end
+      
+      it "writes the opening brackets and the first line" do
+        file_stub.should_receive(:puts).with("\{")
+        file_stub.should_receive(:print).with("\"add\":{\"doc\":{\"title\":\"Some Title\",\"id\":1}}")
+        indexer.write_to_file(to_index)
+      end
+      
+      it "only write fields which are not null" do
+        file_stub.should_receive(:print).with("\"add\":{\"doc\":{\"title\":\"Some Title\",\"id\":1}}")
+        indexer.write_to_file(to_index.merge(:text => nil))
+      end
+      
+      it "separates the first and the second line" do
+        file_stub.should_receive(:puts).with("\{")
+        file_stub.should_receive(:print).with("\"add\":{\"doc\":{\"title\":\"Some Title\",\"id\":1}}")
+        file_stub.should_receive(:print).with(%(,\n"add":{"doc":{"id":2}}))
+        indexer.write_to_file(to_index)
+        indexer.write_to_file({:id => 2})
+      end
+    end
+    
+    it "does not open a new file when already open" do
+      indexer.instance_variable_set("@index_file_stream", file_stub)
+      File.should_not_receive(:open)
+      indexer.write_to_file(to_index)
+    end
+  end
+  
+  describe "#finish" do
+    it "raises an error when stream not open" do
+      lambda {
+        indexer.finish
+      }.should raise_error("nothing to index")
+    end
+    
+    describe "with something being written" do
+      it "writes closing bracket to file" do
+        indexer.write_to_file(to_index)
+        file_stub.should_receive(:puts).with("\}")
+        indexer.finish
+      end
+
+      it "closes the stream" do
+        indexer.write_to_file(to_index)
+        file_stub.should_receive(:close)
+        indexer.finish
+      end
+      
+      it "calls do_index_file" do
+        indexer.write_to_file(to_index)
+        indexer.should_receive(:do_index_file)
+        indexer.finish
+      end
+    end
+  end
+  
+  describe "#do_index_file" do
+    it "raises an error when solr_url not configues" do
+      Supernova::Solr.url = nil
+      lambda {
+        Supernova::SolrIndexer.new.do_index_file
+      }.should raise_error("solr not configured")
+    end
+    
+    it "calls the correct curl command" do
+      indexer.index_file_path = "/tmp/some_path.json"
+      indexer.should_receive(:system).with("curl -s 'http://solr.xx:9333/solr/update/json?commit=true\\&stream.file=/tmp/some_path.json'")
+      indexer.do_index_file(:local => true)
+    end
+    
+    it "executes the correct curl call when not local" do
+      # curl 'http://localhost:8983/solr/update/json?commit=true' --data-binary @books.json -H 'Content-type:application/json'
+      indexer.index_file_path = "/tmp/some_path.json"
+      indexer.should_receive(:system).with("cd /tmp && curl -s 'http://solr.xx:9333/solr/update/json?commit=true' --data-binary @some_path.json -H 'Content-type:application/json'")
+      indexer.do_index_file
+    end
+  end
+end

data/supernova.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-06-09}
+  s.date = %q{2011-06-11}
   s.description = %q{Unified search scopes}
   s.email = %q{tobias.schwab@dynport.de}
   s.extra_rdoc_files = [
@@ -33,8 +33,46 @@ Gem::Specification.new do |s|
     "lib/supernova/numeric_extensions.rb",
     "lib/supernova/solr.rb",
     "lib/supernova/solr_criteria.rb",
+    "lib/supernova/solr_indexer.rb",
     "lib/supernova/thinking_sphinx.rb",
     "lib/supernova/thinking_sphinx_criteria.rb",
+    "solr/conf/admin-extra.html",
+    "solr/conf/elevate.xml",
+    "solr/conf/mapping-FoldToASCII.txt",
+    "solr/conf/mapping-ISOLatin1Accent.txt",
+    "solr/conf/protwords.txt",
+    "solr/conf/schema.xml",
+    "solr/conf/scripts.conf",
+    "solr/conf/solrconfig.xml",
+    "solr/conf/spellings.txt",
+    "solr/conf/stopwords.txt",
+    "solr/conf/synonyms.txt",
+    "solr/conf/velocity/VM_global_library.vm",
+    "solr/conf/velocity/browse.vm",
+    "solr/conf/velocity/cluster.vm",
+    "solr/conf/velocity/clusterResults.vm",
+    "solr/conf/velocity/doc.vm",
+    "solr/conf/velocity/facet_dates.vm",
+    "solr/conf/velocity/facet_fields.vm",
+    "solr/conf/velocity/facet_queries.vm",
+    "solr/conf/velocity/facet_ranges.vm",
+    "solr/conf/velocity/facets.vm",
+    "solr/conf/velocity/footer.vm",
+    "solr/conf/velocity/head.vm",
+    "solr/conf/velocity/header.vm",
+    "solr/conf/velocity/hit.vm",
+    "solr/conf/velocity/jquery.autocomplete.css",
+    "solr/conf/velocity/jquery.autocomplete.js",
+    "solr/conf/velocity/layout.vm",
+    "solr/conf/velocity/main.css",
+    "solr/conf/velocity/query.vm",
+    "solr/conf/velocity/querySpatial.vm",
+    "solr/conf/velocity/suggest.vm",
+    "solr/conf/velocity/tabs.vm",
+    "solr/conf/xslt/example.xsl",
+    "solr/conf/xslt/example_atom.xsl",
+    "solr/conf/xslt/example_rss.xsl",
+    "solr/conf/xslt/luke.xsl",
     "spec/database.sql",
     "spec/integration/solr_spec.rb",
     "spec/integration/thinking_sphinx_spec.rb",
@@ -42,6 +80,7 @@ Gem::Specification.new do |s|
     "spec/supernova/criteria_spec.rb",
     "spec/supernova/numeric_extensions_spec.rb",
     "spec/supernova/solr_criteria_spec.rb",
+    "spec/supernova/solr_indexer_spec.rb",
     "spec/supernova/solr_spec.rb",
     "spec/supernova/thinking_sphinx_criteria_spec.rb",
     "spec/supernova_spec.rb",
@@ -50,7 +89,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dynport/supernova}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Unified search scopes}
 
   if s.respond_to? :specification_version then
@@ -60,6 +99,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thinking-sphinx>, ["= 2.0.3"])
       s.add_runtime_dependency(%q<rsolr>, [">= 0"])
       s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<mysql2>, ["~> 0.2.7"])
       s.add_development_dependency(%q<geokit>, [">= 0"])
@@ -73,6 +113,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<thinking-sphinx>, ["= 2.0.3"])
       s.add_dependency(%q<rsolr>, [">= 0"])
       s.add_dependency(%q<will_paginate>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<mysql2>, ["~> 0.2.7"])
       s.add_dependency(%q<geokit>, [">= 0"])
@@ -87,6 +128,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<thinking-sphinx>, ["= 2.0.3"])
     s.add_dependency(%q<rsolr>, [">= 0"])
     s.add_dependency(%q<will_paginate>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<mysql2>, ["~> 0.2.7"])
     s.add_dependency(%q<geokit>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,9 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-06-11 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +31,11 @@ dependencies:
         - 0
         - 3
         version: 2.0.3
-  version_requirements: *id001
   name: thinking-sphinx
+  version_requirements: *id001
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,11 +45,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
   name: rsolr
+  version_requirements: *id002
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,11 +59,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
   name: will_paginate
+  version_requirements: *id003
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -71,12 +73,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: json
   version_requirements: *id004
-  name: ruby-debug
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: ruby-debug
+  version_requirements: *id005
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -87,12 +103,12 @@ dependencies:
         - 2
         - 7
         version: 0.2.7
-  version_requirements: *id005
   name: mysql2
+  version_requirements: *id006
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,12 +117,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
   name: geokit
+  version_requirements: *id007
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -115,12 +131,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
   name: autotest
+  version_requirements: *id008
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,12 +145,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
   name: autotest-growl
+  version_requirements: *id009
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -145,12 +161,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id009
   name: rspec
+  version_requirements: *id010
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -161,12 +177,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id010
   name: bundler
+  version_requirements: *id011
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -177,12 +193,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  version_requirements: *id011
   name: jeweler
+  version_requirements: *id012
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -191,10 +207,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id012
   name: rcov
+  version_requirements: *id013
   prerelease: false
-  type: :development
 description: Unified search scopes
 email: tobias.schwab@dynport.de
 executables: []
@@ -221,8 +236,46 @@ files:
 - lib/supernova/numeric_extensions.rb
 - lib/supernova/solr.rb
 - lib/supernova/solr_criteria.rb
+- lib/supernova/solr_indexer.rb
 - lib/supernova/thinking_sphinx.rb
 - lib/supernova/thinking_sphinx_criteria.rb
+- solr/conf/admin-extra.html
+- solr/conf/elevate.xml
+- solr/conf/mapping-FoldToASCII.txt
+- solr/conf/mapping-ISOLatin1Accent.txt
+- solr/conf/protwords.txt
+- solr/conf/schema.xml
+- solr/conf/scripts.conf
+- solr/conf/solrconfig.xml
+- solr/conf/spellings.txt
+- solr/conf/stopwords.txt
+- solr/conf/synonyms.txt
+- solr/conf/velocity/VM_global_library.vm
+- solr/conf/velocity/browse.vm
+- solr/conf/velocity/cluster.vm
+- solr/conf/velocity/clusterResults.vm
+- solr/conf/velocity/doc.vm
+- solr/conf/velocity/facet_dates.vm
+- solr/conf/velocity/facet_fields.vm
+- solr/conf/velocity/facet_queries.vm
+- solr/conf/velocity/facet_ranges.vm
+- solr/conf/velocity/facets.vm
+- solr/conf/velocity/footer.vm
+- solr/conf/velocity/head.vm
+- solr/conf/velocity/header.vm
+- solr/conf/velocity/hit.vm
+- solr/conf/velocity/jquery.autocomplete.css
+- solr/conf/velocity/jquery.autocomplete.js
+- solr/conf/velocity/layout.vm
+- solr/conf/velocity/main.css
+- solr/conf/velocity/query.vm
+- solr/conf/velocity/querySpatial.vm
+- solr/conf/velocity/suggest.vm
+- solr/conf/velocity/tabs.vm
+- solr/conf/xslt/example.xsl
+- solr/conf/xslt/example_atom.xsl
+- solr/conf/xslt/example_rss.xsl
+- solr/conf/xslt/luke.xsl
 - spec/database.sql
 - spec/integration/solr_spec.rb
 - spec/integration/thinking_sphinx_spec.rb
@@ -230,10 +283,12 @@ files:
 - spec/supernova/criteria_spec.rb
 - spec/supernova/numeric_extensions_spec.rb
 - spec/supernova/solr_criteria_spec.rb
+- spec/supernova/solr_indexer_spec.rb
 - spec/supernova/solr_spec.rb
 - spec/supernova/thinking_sphinx_criteria_spec.rb
 - spec/supernova_spec.rb
 - supernova.gemspec
+has_rdoc: true
 homepage: http://github.com/dynport/supernova
 licenses: 
 - MIT
@@ -263,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Unified search scopes