supernova 0.6.7 → 0.6.8

data/spec/supernova/solr_indexer_spec.rb

@@ -452,6 +452,14 @@ describe Supernova::SolrIndexer do
       indexer.index_with_json([1])
     end
     
+    it "does not break when called with empty array" do
+      index.should_not_receive(:index_with_json_string)
+      index.should_not_receive(:index_with_json_file)
+      lambda {
+        indexer.index_with_json([])
+      }.should_not raise_error
+    end
+    
     it "calls index_with_json_file when asked to" do
       indexer.options[:use_json_file] = true
       indexer.should_receive(:index_with_json_file).with([1])
@@ -460,10 +468,10 @@ describe Supernova::SolrIndexer do
   end
   
   describe "#index_rows" do
-    let(:row1) { double("row1") }
-    let(:row2) { double("row2") }
-    let(:mapped1) { double("mapped 1") }
-    let(:mapped2) { double("mapped 2") }
+    let(:row1) { { :id => "row1" } }
+    let(:row2) { { :id => "row2" } }
+    let(:mapped1) { { :id => "mapped1" } }
+    let(:mapped2) { { :id => "mapped2" } }
     
     before(:each) do
       custom_indexer.stub(:map_for_solr).with(row1).and_return(mapped1)
@@ -525,21 +533,27 @@ describe Supernova::SolrIndexer do
       Supernova::Solr.stub!(:connection).and_return solr
     end
     
-    it "calls the correct add statement" do
+    it "deligates to index_with_json" do
       row1 = double("1")
       row2 = double("2")
       rows = [row1, row2]
+      indexer.should_receive(:index_with_json).with(rows).and_return "the result"
+      indexer.index_directly(rows).should == "the result"
+    end
+    
+    xit "calls the correct add statement" do
+
       solr.should_receive(:add).with(row1)
       solr.should_receive(:add).with(row2)
       indexer.index_directly(rows)
     end
     
-    it "calls commit" do
+    xit "calls commit" do
       solr.should_receive(:commit)
       indexer.index_directly([double("1")])
     end
     
-    it "does not call commit when rows is empty" do
+    xit "does not call commit when rows is empty" do
       solr.should_not_receive(:commit)
       indexer.index_directly([])
     end

data/spec/supernova/solr_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe Supernova::Solr do
-  let(:rsolr) { double("rsolr") }
-  
   before(:each) do
-    RSolr.stub!(:connect).and_return rsolr
+    Supernova::Solr.url = "http://some.host:12345/path/to/solr"
   end
   
   describe "#url=" do
@@ -14,32 +12,21 @@ describe Supernova::Solr do
     end
   end
   
-  describe "#solr_connection" do
-    after(:each) do
-      Supernova::Solr.url = nil
-    end
-    
-    before(:each) do
-      Supernova::Solr.url = "/some/url"
-    end
-    
-    it "connects creates and stores a new RSolr connection" do
-      RSolr.should_receive(:connect).with(:url => "/some/url").and_return rsolr
-      Supernova::Solr.connection.should == rsolr
-      Supernova::Solr.instance_variable_get("@connection").should == rsolr
-    end
-    
-    it "returns a stored connection" do
-      con = double("con")
-      Supernova::Solr.instance_variable_set("@connection", con)
-      Supernova::Solr.connection.should == con
+  describe "truncate!" do
+    it "sends the correct update request" do
+      Typhoeus::Request.should_receive(:post).with("http://some.host:12345/path/to/solr/update", 
+        :body => %(<?xml version="1.0" encoding="UTF-8"?><delete><query>*:*</query></delete>), :headers => { "Content-Type" => "text/xml"}
+      )
+      Supernova::Solr.truncate!
     end
   end
   
-  describe "truncate!" do
-    it "calls delete_by_query on connection" do
-      Supernova::Solr.connection.should_receive(:delete_by_query).with("*:*")
-      Supernova::Solr.truncate!
+  describe "#commit!" do
+    it "sends the correct update request" do
+      Typhoeus::Request.should_receive(:post).with("http://some.host:12345/path/to/solr/update", 
+        :body => %(<?xml version="1.0" encoding="UTF-8"?><commit />), :headers => { "Content-Type" => "text/xml"}
+      )
+      Supernova::Solr.commit!
     end
   end
 end

data/spec/supernova_spec.rb

@@ -48,7 +48,7 @@ describe Supernova do
       end
 
       it "sets the correct order option" do
-        clazz.popular.search_options[:order].should == "popularity desc"
+        clazz.popular.search_options[:order].should == ["popularity desc"]
       end
       
       it "adds the name of the scope to the defined_named_search_scopes array" do
@@ -80,7 +80,7 @@ describe Supernova do
       end
       
       it "allows chaining of named_search_scopes" do
-        clazz.for_artists(%w(1 3 2)).popular.search_options[:order].should == "popularity desc"
+        clazz.for_artists(%w(1 3 2)).popular.search_options[:order].should == ["popularity desc"]
       end
     end
   end

data/supernova.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{supernova}
-  s.version = "0.6.7"
+  s.name = "supernova"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-11-07}
-  s.default_executable = %q{start_solr}
-  s.description = %q{Unified search scopes}
-  s.email = %q{tobias.schwab@dynport.de}
+  s.date = "2012-02-08"
+  s.description = "Unified search scopes"
+  s.email = "tobias.schwab@dynport.de"
   s.executables = ["start_solr"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -92,67 +91,64 @@ Gem::Specification.new do |s|
     "spec/supernova_spec.rb",
     "supernova.gemspec"
   ]
-  s.homepage = %q{http://github.com/dynport/supernova}
+  s.homepage = "http://github.com/dynport/supernova"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Unified search scopes}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Unified search scopes"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rsolr>, [">= 0"])
       s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
+      s.add_runtime_dependency(%q<typhoeus>, ["= 0.3.3"])
       s.add_development_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, ["~> 3.0.7"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<mysql2>, ["~> 0.2.7"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<mysql2>, ["~> 0.2.18"])
       s.add_development_dependency(%q<ZenTest>, ["= 4.5.0"])
       s.add_development_dependency(%q<geokit>, [">= 0"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<autotest-growl>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<rsolr>, [">= 0"])
       s.add_dependency(%q<will_paginate>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<typhoeus>, [">= 0"])
+      s.add_dependency(%q<typhoeus>, ["= 0.3.3"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<activerecord>, ["~> 3.0.7"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<mysql2>, ["~> 0.2.7"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<mysql2>, ["~> 0.2.18"])
       s.add_dependency(%q<ZenTest>, ["= 4.5.0"])
       s.add_dependency(%q<geokit>, [">= 0"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<autotest-growl>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rsolr>, [">= 0"])
     s.add_dependency(%q<will_paginate>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<typhoeus>, [">= 0"])
+    s.add_dependency(%q<typhoeus>, ["= 0.3.3"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<activerecord>, ["~> 3.0.7"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<mysql2>, ["~> 0.2.7"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<mysql2>, ["~> 0.2.18"])
     s.add_dependency(%q<ZenTest>, ["= 4.5.0"])
     s.add_dependency(%q<geokit>, [">= 0"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<autotest-growl>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
     s.add_dependency(%q<rcov>, [">= 0"])

metadata

@@ -1,284 +1,202 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: supernova
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 0.6.8
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 7
-  version: 0.6.7
 platform: ruby
-authors: 
+authors:
 - Tobias Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-07 00:00:00 +01:00
-default_executable: start_solr
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rsolr
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+date: 2012-02-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: will_paginate
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70194489138220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489138220
+- !ruby/object:Gem::Dependency
   name: json
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70194489137740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489137740
+- !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70194489137260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489137260
+- !ruby/object:Gem::Dependency
   name: typhoeus
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70194489136780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.3.3
   type: :runtime
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489136780
+- !ruby/object:Gem::Dependency
   name: i18n
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70194489136300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489136300
+- !ruby/object:Gem::Dependency
   name: activerecord
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70194489135820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 0
-        - 7
+      - !ruby/object:Gem::Version
         version: 3.0.7
-  prerelease: false
   type: :development
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: *70194489135820
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &70194489135340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489135340
+- !ruby/object:Gem::Dependency
   name: mysql2
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70194489134860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 2
-        - 7
-        version: 0.2.7
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 0.2.18
   type: :development
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489134860
+- !ruby/object:Gem::Dependency
   name: ZenTest
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70194489038360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 4
-        - 5
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 4.5.0
-  prerelease: false
   type: :development
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489038360
+- !ruby/object:Gem::Dependency
   name: geokit
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &70194489037880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489037880
+- !ruby/object:Gem::Dependency
   name: autotest
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: &70194489037400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id012
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489037400
+- !ruby/object:Gem::Dependency
   name: autotest-growl
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  requirement: &70194489036920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id013
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489036920
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  requirement: &70194489036440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
-  requirement: *id014
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489036440
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  requirement: &70194489035960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  prerelease: false
   type: :development
-  requirement: *id015
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489035960
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  requirement: &70194489035480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.6.0
-  prerelease: false
   type: :development
-  requirement: *id016
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70194489035480
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  requirement: &70194489035000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id017
+  prerelease: false
+  version_requirements: *70194489035000
 description: Unified search scopes
 email: tobias.schwab@dynport.de
-executables: 
+executables:
 - start_solr
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 - TODO
-files: 
+files:
 - .autotest
 - .document
 - .rspec
@@ -350,39 +268,32 @@ files:
 - spec/supernova/symbol_extensions_spec.rb
 - spec/supernova_spec.rb
 - supernova.gemspec
-has_rdoc: true
 homepage: http://github.com/dynport/supernova
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1145340675698901426
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Unified search scopes
 test_files: []
-