flare 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/flare.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flare}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Dwan"]
-  s.date = %q{2010-01-18}
+  s.date = %q{2010-01-26}
   s.description = %q{This needs to get updated}
   s.email = %q{mpdwan@gmail.com}
   s.extra_rdoc_files = [

data/lib/flare/active_record.rb

@@ -73,7 +73,11 @@ module Flare
     
     module InstanceMethods
       def to_solr_doc
-        doc = { :id => solr_document_id, :type => self.class.name }
+        doc = {
+          :fields => { :id => solr_document_id, :type => self.class.name },
+          :attributes => {}
+        }
+
         solr_index[:fields].each do |field|
           value = send(field[:source])
           # Need to convert dates to utc xmlschema.
@@ -81,8 +85,13 @@ module Flare
           if value.respond_to?(:utc)
             value = value.utc.xmlschema
           end
-          doc[field[:name]] = value
+          doc[:fields][field[:name]] = value
+        end
+        
+        solr_index[:attributes].each do |key, value|
+          doc[:attributes][key] = value.kind_of?(Symbol) ? send(value) : value
         end
+        
         doc
       end
       

data/lib/flare/index_builder.rb

@@ -4,11 +4,12 @@ module Flare
 
     def initialize(&block)
       @fields = []
+      @attributes = {}
       self.instance_eval(&block) if block_given?
     end
 
     def index
-      { :fields => @fields }
+      { :fields => @fields, :attributes => @attributes }
     end
 
     protected
@@ -20,5 +21,9 @@ module Flare
           :boost => options[:boost] || nil
           }
       end
+      
+      def attribute(name, value)
+        @attributes[name] = value
+      end
   end
 end

data/lib/flare/session.rb

@@ -25,7 +25,10 @@ module Flare
     
     def index(*objects)
       objects = ensure_searchable(objects)
-      connection.add(objects.collect(&:to_solr_doc))
+      objects.collect(&:to_solr_doc).each do |doc|
+        connection.update(RSolr::Message::Builder.new.add(doc[:fields], doc[:attributes]))
+        # connection.add(doc[:fields], doc[:attributes])
+      end
     end
     
     def index!(*objects)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flare
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Michael Dwan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-18 00:00:00 -06:00
+date: 2010-01-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency