solr_mapper 0.1.3 → 0.1.4

data/Manifest

@@ -1,5 +1,4 @@
 LICENSE.txt
-Manifest
 README.rdoc
 Rakefile
 lib/solr_mapper.rb
@@ -7,7 +6,6 @@ lib/solr_mapper/calculations.rb
 lib/solr_mapper/locators.rb
 lib/solr_mapper/relations.rb
 lib/solr_mapper/solr_document.rb
-solr_mapper.gemspec
 spec/base.rb
 spec/calculations_spec.rb
 spec/locators_spec.rb
@@ -19,3 +17,4 @@ spec/solr/stuff/config/schema.xml
 spec/solr/thing/config/schema.xml
 spec/solr/widget/conf/schema.xml
 spec/url_spec.rb
+Manifest

data/Rakefile

@@ -16,7 +16,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('solr_mapper', '0.1.3') do |p|
+Echoe.new('solr_mapper', '0.1.4') do |p|
   p.description    = "Object Document Mapper for the Apache Foundation's Solr search platform"
   p.url            = "http://github.com/skunkworx/solr_mapper"
   p.author         = "Chris Umbel"

data/lib/solr_mapper/solr_document.rb

@@ -25,10 +25,12 @@ module SolrMapper
       attr_accessor :per_page
       attr_accessor :solr_fields
 
+      # send a read REST command to Solr
       def execute_read(opts)
         eval(RestClient.get(build_url('select', opts.merge(:wt => 'ruby'))))
       end
 
+      # send a write REST command to SOlr
       def execute_write(data, opts = nil)
         send_update(data, opts)
 
@@ -47,6 +49,7 @@ module SolrMapper
         URI::escape("#{base_url}/#{path}#{qs}")
       end
 
+      # create a querystring from a hash
       def build_qs(opts)
         uri = ''
 
@@ -66,11 +69,13 @@ module SolrMapper
         query(values, opts)
       end
 
+      # main interface by which consumers search solr via SolrMapper
       def query(values, opts = {})
         results, _ = query_counted(values, opts)
         results
       end
 
+      # execute  solr query and return the count as well as the results
       def query_counted(values, opts = {})
         if values.kind_of?(Hash)
           search_string = ''
@@ -88,6 +93,7 @@ module SolrMapper
         return map(response), response['response']['numFound']
       end
 
+      # look up an object by primary key
       def find(id)
         result = query(:id => id)
         return result[0] if result.count > 0
@@ -114,29 +120,32 @@ module SolrMapper
       end
 
       protected
+      # map values returned from Solr into ruby objects
       def map(docs)
         objs = []
 
         docs['response']['docs'].each do |doc|
           obj = self.new
+          obj.send(:before_load) if obj.respond_to?(:before_load)
 
           doc.each_pair do |k, v|
             k = '_id' if k.to_s == 'id'
 
-            unless obj.class.method_defined?(k)
-              class_eval { attr_accessor k }
-              solr_fields << k.to_s unless solr_fields.include?(k.to_s)
-            end
-            
-            obj.instance_variable_set("@#{k}", v)
+            class_eval { attr_accessor k } unless obj.respond_to?("#{k}=")
+            self.solr_fields << k unless self.solr_fields.include?(k)
+
+            obj.send("#{k}=", v)
           end
 
+          obj.send(:after_load) if obj.respond_to?(:after_load)
+
           objs << obj
         end
 
         objs
       end
 
+
       def send_update(data, opts = nil)
         solr_resource = RestClient::Resource.new(build_url('update', opts))
         solr_resource.post(data, {:content_type => 'text/xml'})
@@ -154,9 +163,14 @@ module SolrMapper
     end
 
     def save()
+      send(:before_save) if respond_to?(:before_save)
+
       self.class.execute_write(to_solr_xml, {:overwrite => true})
+
+      send(:after_save) if respond_to?(:after_save)      
     end
 
+    # remove an object from the index
     def destroy
       # make an xml delete message that Solr will be happy with
       delete_message = ''
@@ -169,6 +183,7 @@ module SolrMapper
       self.class.execute_write(delete_message)
     end
 
+    # convert a ruby object to xml compliant with a Solr update REST command
     def to_solr_xml
       output = ''
       builder = Builder::XmlMarkup.new(:target => output, :indent => 2)
@@ -214,6 +229,7 @@ module SolrMapper
       save()
     end
 
+    # handle rails building a url from us
     def to_param
       instance_variable_get('@_id').to_s
     end

data/solr_mapper.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solr_mapper}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Umbel"]
-  s.date = %q{2010-10-26}
+  s.date = %q{2010-10-27}
   s.description = %q{Object Document Mapper for the Apache Foundation's Solr search platform}
   s.email = %q{chrisu@dvdempire.com}
   s.extra_rdoc_files = ["LICENSE.txt", "README.rdoc", "lib/solr_mapper.rb", "lib/solr_mapper/calculations.rb", "lib/solr_mapper/locators.rb", "lib/solr_mapper/relations.rb", "lib/solr_mapper/solr_document.rb"]
-  s.files = ["LICENSE.txt", "Manifest", "README.rdoc", "Rakefile", "lib/solr_mapper.rb", "lib/solr_mapper/calculations.rb", "lib/solr_mapper/locators.rb", "lib/solr_mapper/relations.rb", "lib/solr_mapper/solr_document.rb", "solr_mapper.gemspec", "spec/base.rb", "spec/calculations_spec.rb", "spec/locators_spec.rb", "spec/misc_spec.rb", "spec/paginated_spec.rb", "spec/query_spec.rb", "spec/relation_spec.rb", "spec/solr/stuff/config/schema.xml", "spec/solr/thing/config/schema.xml", "spec/solr/widget/conf/schema.xml", "spec/url_spec.rb"]
+  s.files = ["LICENSE.txt", "README.rdoc", "Rakefile", "lib/solr_mapper.rb", "lib/solr_mapper/calculations.rb", "lib/solr_mapper/locators.rb", "lib/solr_mapper/relations.rb", "lib/solr_mapper/solr_document.rb", "spec/base.rb", "spec/calculations_spec.rb", "spec/locators_spec.rb", "spec/misc_spec.rb", "spec/paginated_spec.rb", "spec/query_spec.rb", "spec/relation_spec.rb", "spec/solr/stuff/config/schema.xml", "spec/solr/thing/config/schema.xml", "spec/solr/widget/conf/schema.xml", "spec/url_spec.rb", "Manifest", "solr_mapper.gemspec"]
   s.homepage = %q{http://github.com/skunkworx/solr_mapper}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Solr_mapper", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Chris Umbel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +00:00
+date: 2010-10-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,7 +85,6 @@ extra_rdoc_files:
 - lib/solr_mapper/solr_document.rb
 files: 
 - LICENSE.txt
-- Manifest
 - README.rdoc
 - Rakefile
 - lib/solr_mapper.rb
@@ -93,7 +92,6 @@ files:
 - lib/solr_mapper/locators.rb
 - lib/solr_mapper/relations.rb
 - lib/solr_mapper/solr_document.rb
-- solr_mapper.gemspec
 - spec/base.rb
 - spec/calculations_spec.rb
 - spec/locators_spec.rb
@@ -105,6 +103,8 @@ files:
 - spec/solr/thing/config/schema.xml
 - spec/solr/widget/conf/schema.xml
 - spec/url_spec.rb
+- Manifest
+- solr_mapper.gemspec
 has_rdoc: true
 homepage: http://github.com/skunkworx/solr_mapper
 licenses: []