supernova 0.3.5 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/supernova/solr_criteria.rb

@@ -90,11 +90,12 @@ class Supernova::SolrCriteria < Supernova::Criteria
     return hash if !hash["type"].respond_to?(:constantize)
     doc = hash["type"].constantize.new
     doc.instance_variable_set("@solr_doc", hash)
-    hash.each do |key, value|
-      if key == "id"
-        doc.id = value.to_s.split("/").last if doc.respond_to?(:id=)
-      else
-        set_first_responding_attribute(doc, key, value)
+    atts = convert_doc_attributes(hash)
+    if doc.instance_variables.include?("@attributes")
+      doc.instance_variable_set("@attributes", atts.except("type"))
+    else
+      atts.each do |key, value|
+        doc.send(:"#{key}=", value) if doc.respond_to?(:"#{key}=")
       end
     end
     doc.instance_variable_set("@readonly", true)
@@ -102,6 +103,17 @@ class Supernova::SolrCriteria < Supernova::Criteria
     doc
   end
   
+  def convert_doc_attributes(hash)
+    hash.inject({}) do |ret, (key, value)|
+      if key == "id"
+        ret["id"] = value.to_s.split("/").last
+      else
+        ret[reverse_lookup_solr_field(key).to_s] = value
+      end
+      ret
+    end
+  end
+  
   def set_first_responding_attribute(doc, solr_key, value)
     [reverse_lookup_solr_field(solr_key), solr_key].each do |key|
       meth = :"#{key}="

data/lib/supernova/solr_indexer.rb

@@ -48,7 +48,8 @@ class Supernova::SolrIndexer
     :float => :f,
     :date => :dt,
     :boolean => :b,
-    :location => :p
+    :location => :p,
+    :double => :d
   }
   
   def initialize(options = {})

data/spec/supernova/solr_criteria_spec.rb

@@ -268,6 +268,12 @@ describe Supernova::SolrCriteria do
       end
     end
     
+    it "updates the attributes hash when defined" do
+      atts = { "type" => "Offer", "some_other" => "Test", "id" => "offers/1", "enabled" => false, "popularity" => 10 }
+      doc = criteria.build_doc(atts)
+      doc.instance_variable_get("@attributes").should == { "popularity" => 10, "enabled" => false, "id" => "1", "some_other" => "Test"}
+    end
+    
     it "returns a Hash when type does not response to " do
       type = double("type")
       type.should_receive(:respond_to?).with(:constantize).and_return false

data/spec/supernova/solr_indexer_spec.rb

@@ -97,6 +97,7 @@ describe Supernova::SolrIndexer do
       [:lat, :float] => "lat AS lat_f",
       [:text, :boolean] => "text AS text_b",
       [:loc, :location] => "loc AS loc_p",
+      [:big_int, :double] => "big_int AS big_int_d",
       [:deleted_at, :date] => %(IF(deleted_at IS NULL, NULL, CONCAT(REPLACE(deleted_at, " ", "T"), "Z")) AS deleted_at_dt),
     }.each do |(field, type), name|
       it "maps #{field} with #{type} to #{name}" do

data/supernova.gemspec

@@ -5,17 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-06-12}
+  s.date = %q{2011-06-13}
   s.description = %q{Unified search scopes}
   s.email = %q{tobias.schwab@dynport.de}
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc",
-    "TODO"
+    "README.rdoc"
   ]
   s.files = [
     ".autotest",
@@ -94,7 +93,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.6.2}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{Unified search scopes}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,11 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 +02:00
-default_executable: 
+date: 2011-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +29,11 @@ dependencies:
         - 0
         - 3
         version: 2.0.3
-  name: thinking-sphinx
   version_requirements: *id001
+  name: thinking-sphinx
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +43,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rsolr
   version_requirements: *id002
+  name: rsolr
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,11 +57,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: will_paginate
   version_requirements: *id003
+  name: will_paginate
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,11 +71,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: json
   version_requirements: *id004
+  name: json
   prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -87,11 +85,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: ruby-debug
   version_requirements: *id005
+  name: ruby-debug
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -103,11 +101,11 @@ dependencies:
         - 2
         - 7
         version: 0.2.7
-  name: mysql2
   version_requirements: *id006
+  name: mysql2
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -117,11 +115,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: geokit
   version_requirements: *id007
+  name: geokit
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -131,11 +129,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: autotest
   version_requirements: *id008
+  name: autotest
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -145,11 +143,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: autotest-growl
   version_requirements: *id009
+  name: autotest-growl
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -161,11 +159,11 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  name: rspec
   version_requirements: *id010
+  name: rspec
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -177,11 +175,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
   version_requirements: *id011
+  name: bundler
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -193,11 +191,11 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  name: jeweler
   version_requirements: *id012
+  name: jeweler
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -207,9 +205,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
   version_requirements: *id013
+  name: rcov
   prerelease: false
+  type: :development
 description: Unified search scopes
 email: tobias.schwab@dynport.de
 executables: []
@@ -219,7 +218,6 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-- TODO
 files: 
 - .autotest
 - .document
@@ -293,8 +291,6 @@ files:
 - spec/supernova/thinking_sphinx_criteria_spec.rb
 - spec/supernova_spec.rb
 - supernova.gemspec
-- TODO
-has_rdoc: true
 homepage: http://github.com/dynport/supernova
 licenses: 
 - MIT
@@ -324,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Unified search scopes

data/TODO

@@ -1,3 +0,0 @@
-- mapping von dynamic zu static fields in load_document
-- setzen von solr_row in load document
-- speichern von :type in :type_s