supernova 0.4.17 → 0.4.18

data/Gemfile

@@ -9,12 +9,14 @@ source "http://rubygems.org"
 gem "rsolr"
 gem "will_paginate"
 gem "json"
+gem "i18n"
 gem "activesupport"
-gem "activerecord"
 
 group :development do
+  gem 'activerecord', '~>3.0.7', :require => "active_record"
   gem "ruby-debug"
   gem "mysql2", "~> 0.2.7"
+  gem "ZenTest", "4.5.0"
   gem "geokit"
   gem "autotest"
   gem "autotest-growl"

data/Gemfile.lock

@@ -2,35 +2,36 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.5.0)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.5.0)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activesupport (3.0.9)
+    arel (2.0.10)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     autotest-growl (0.2.9)
     builder (2.1.2)
-    columnize (0.3.2)
+    columnize (0.3.4)
     diff-lcs (1.1.2)
     geokit (1.6.0)
     git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.6.2)
+    i18n (0.5.0)
+    jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.1)
-    linecache (0.43)
-    mysql2 (0.2.7)
+    json (1.5.3)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mysql2 (0.2.11)
     rake (0.9.2)
+    rbx-require-relative (0.0.5)
     rcov (0.9.9)
     rsolr (1.0.2)
       builder (>= 2.1.2)
@@ -54,12 +55,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
+  ZenTest (= 4.5.0)
+  activerecord (~> 3.0.7)
   activesupport
   autotest
   autotest-growl
   bundler (~> 1.0.0)
   geokit
+  i18n
   jeweler (~> 1.6.0)
   json
   mysql2 (~> 0.2.7)

data/TODO

@@ -0,0 +1,3 @@
+- mapping dynamic to static fields in load_document?
+- set solr_row in load_document
+- save type in type_s unless otherwise configured

data/VERSION

@@ -1 +1 @@
-0.4.17
+0.4.18

data/lib/supernova/solr_indexer.rb

@@ -116,8 +116,11 @@ class Supernova::SolrIndexer
   
   def map_hash_keys_to_solr(hash)
     @indexed_at ||= Time.now.utc.iso8601.to_s
+    if hash["id"] && self.table_name
+      hash["record_id_i"] = hash["id"]
+      hash["id"] = [self.table_name, hash["id"]].compact.join("/") 
+    end
     hash["indexed_at_dt"] = @indexed_at
-    hash["id_s"] = [self.class.table_name, hash["id"]].compact.join("/") if hash["id"]
     self.class.field_definitions.each do |field, options|
       if hash.has_key?(field.to_s)
         value = hash.delete(field.to_s)

data/spec/supernova/solr_indexer_spec.rb

@@ -313,10 +313,18 @@ describe Supernova::SolrIndexer do
       clazz.new.map_hash_keys_to_solr({})["type"].should == "Offer"
     end
     
-    it "uses the table_name as prefix for ids" do
+    it "adds the table_name as prefix for id" do
       clazz = Class.new(Supernova::SolrIndexer)
-      clazz.table_name :people
-      clazz.new.map_hash_keys_to_solr({ "id" => 88 })["id_s"].should == "people/88"
+      index = clazz.new
+      index.stub(:table_name).and_return "people"
+      index.map_hash_keys_to_solr({ "id" => 88 })["id"].should == "people/88"
+    end
+    
+    it "sets the record id when table is set" do
+      clazz = Class.new(Supernova::SolrIndexer)
+      index = clazz.new
+      index.stub(:table_name).and_return "people"
+      index.map_hash_keys_to_solr({ "id" => 88 })["record_id_i"].should == 88
     end
     
     it "adds the sets the cla" do

data/supernova.gemspec

@@ -5,17 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.4.17"
+  s.version = "0.4.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-08-02}
+  s.date = %q{2011-08-04}
+  s.default_executable = %q{start_solr}
   s.description = %q{Unified search scopes}
   s.email = %q{tobias.schwab@dynport.de}
   s.executables = ["start_solr"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.rdoc",
+    "TODO"
   ]
   s.files = [
     ".autotest",
@@ -26,6 +28,7 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
+    "TODO",
     "VERSION",
     "autotest/discover.rb",
     "bin/start_solr",
@@ -92,7 +95,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
@@ -102,10 +105,12 @@ Gem::Specification.new do |s|
       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<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 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<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"])
@@ -117,10 +122,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rsolr>, [">= 0"])
       s.add_dependency(%q<will_paginate>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 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<ZenTest>, ["= 4.5.0"])
       s.add_dependency(%q<geokit>, [">= 0"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<autotest-growl>, [">= 0"])
@@ -133,10 +140,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rsolr>, [">= 0"])
     s.add_dependency(%q<will_paginate>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 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<ZenTest>, ["= 4.5.0"])
     s.add_dependency(%q<geokit>, [">= 0"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<autotest-growl>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 4
-  - 17
-  version: 0.4.17
+  - 18
+  version: 0.4.18
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,9 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 Z
+date: 2011-08-04 00:00:00 +02:00
+default_executable: start_solr
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
   name: rsolr
+  version_requirements: *id001
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -41,11 +43,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
   name: will_paginate
+  version_requirements: *id002
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,11 +57,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
   name: json
+  version_requirements: *id003
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,11 +71,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: i18n
   version_requirements: *id004
-  name: activesupport
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -83,12 +85,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: activesupport
   version_requirements: *id005
-  name: activerecord
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 3
+        - 0
+        - 7
+        version: 3.0.7
+  name: activerecord
+  version_requirements: *id006
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,12 +115,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
   name: ruby-debug
+  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: 
     - - ~>
@@ -113,12 +131,28 @@ dependencies:
         - 2
         - 7
         version: 0.2.7
-  version_requirements: *id007
   name: mysql2
+  version_requirements: *id008
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 4
+        - 5
+        - 0
+        version: 4.5.0
+  name: ZenTest
+  version_requirements: *id009
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,12 +161,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
   name: geokit
+  version_requirements: *id010
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -141,12 +175,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id009
   name: autotest
+  version_requirements: *id011
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -155,12 +189,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id010
   name: autotest-growl
+  version_requirements: *id012
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -171,12 +205,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id011
   name: rspec
+  version_requirements: *id013
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -187,12 +221,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id012
   name: bundler
+  version_requirements: *id014
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -203,12 +237,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  version_requirements: *id013
   name: jeweler
+  version_requirements: *id015
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -217,10 +251,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id014
   name: rcov
+  version_requirements: *id016
   prerelease: false
-  type: :development
 description: Unified search scopes
 email: tobias.schwab@dynport.de
 executables: 
@@ -230,6 +263,7 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
+- TODO
 files: 
 - .autotest
 - .document
@@ -239,6 +273,7 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- TODO
 - VERSION
 - autotest/discover.rb
 - bin/start_solr
@@ -301,6 +336,7 @@ files:
 - spec/supernova/symbol_extensions_spec.rb
 - spec/supernova_spec.rb
 - supernova.gemspec
+has_rdoc: true
 homepage: http://github.com/dynport/supernova
 licenses: 
 - MIT
@@ -330,7 +366,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