customized-mongomapper-search 1.0.1 → 1.0.2

data/CHANGE_LOG

@@ -1,3 +1,8 @@
+1.0.2
+------
+- Added a class method "idx_force_commit" that specifies whether index and delete operations should be force committed.  ******* All index and delete operations now default to not being force committed. *******
+- Cleaned up code
+
 1.0.1
 ------
 - Changed the output format of attributes of class type Time so that it complies with Solr's date field type.  The output format is now %Y-%m-%dT%H:%M:%SZ.  e.g. 2001-06-11T00:00:00Z

data/README.rdoc

@@ -1,13 +1,13 @@
 = tsxn-mongomapper-search
 
-Easily integrate Mongo Mapper with with Solr search.  
+Easily integrate Mongo Mapper with with Solr search.  Please view the CHANGELOG before updating the gem.
 
 == Credits
 
 Earlier versions < 1.0.0 were based off the mongomapper-search gem written by Fernando Meyer that can be found at http://github.com/fmeyer/mongomapper-search.
 
 == Usage 
-== Version 1.0.0
+== Version 1.0.2
 
 To make a MongoMapper::Document indexable add the following line to include the functionality:
 
@@ -16,6 +16,10 @@ To make a MongoMapper::Document indexable add the following line to include the
 The Solr URL must be specified using the :solr_url method.  e.g.
 
 	solr_url "http://localhost/solr/some.core"
+	
+To specify that the index and delete operations into Solr should be force committed the :idx_force_commit method must be passed a value of true.  It currently defaults to a value of false.  e.g.
+
+	idx_force_commit true
 
 To specify which attributes that need to be indexable pass hashes with the attributes and the corresponding indexed names to the :idx_attr method.  e.g.
 
@@ -52,6 +56,7 @@ Define a Document model and specify the indexable fields and associations.
 		solr_url "http://search-api.search.com/solr/employee.core"
 		idx_attr :_id => "emp_id", :name => "emp_name"
 		idx_assoc :projects => "emp_project"
+		idx_force_commit true
 		
 		key :name
 		many :projects

data/Rakefile

@@ -2,8 +2,8 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('customized-mongomapper-search', '1.0.1') do |p|
-  p.description    = "Easily integreate mongo mapper with enterprise search like solr.  Based off of the original mongomapper-search gem (version 0.1.0) that written by Fernando Meyer and can be found at http://github.com/fmeyer/mongomapper-search."
+Echoe.new('customized-mongomapper-search', '1.0.2') do |p|
+  p.description    = "Easily integrate Mongo Mapper with with Solr search.  Please view the CHANGELOG file found on the GitHub project homepage before upgrading."
   p.url            = "http://github.com/tsxn26/customized-mongomapper-search"
   p.author         = ["Thomas Nguyen"]
   p.email          = "tsxn26@gmail.com"

data/customized-mongomapper-search.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{customized-mongomapper-search}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Nguyen"]
   s.date = %q{2010-06-11}
-  s.description = %q{Easily integreate mongo mapper with enterprise search like solr.  Based off of the original mongomapper-search gem (version 0.1.0) that written by Fernando Meyer and can be found at http://github.com/fmeyer/mongomapper-search.}
+  s.description = %q{Easily integrate Mongo Mapper with with Solr search.  Please view the CHANGELOG file found on the GitHub project homepage before upgrading.}
   s.email = %q{tsxn26@gmail.com}
   s.extra_rdoc_files = ["README.rdoc", "lib/customized-mongomapper-search.rb", "lib/search/indexable.rb", "lib/search/searchable.rb"]
   s.files = ["CHANGE_LOG", "README.rdoc", "Rakefile", "lib/customized-mongomapper-search.rb", "lib/search/indexable.rb", "lib/search/searchable.rb", "Manifest", "customized-mongomapper-search.gemspec"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{customized-mongomapper-search}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Easily integreate mongo mapper with enterprise search like solr.  Based off of the original mongomapper-search gem (version 0.1.0) that written by Fernando Meyer and can be found at http://github.com/fmeyer/mongomapper-search.}
+  s.summary = %q{Easily integrate Mongo Mapper with with Solr search.  Please view the CHANGELOG file found on the GitHub project homepage before upgrading.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/search/indexable.rb

@@ -29,65 +29,54 @@ module Search
         @idx_assocs = {}
         args.each { |x| @idx_assocs.merge!(x) }
       end
+      
+      def idx_force_commit(commit = false)
+        @idx_force_commit ||= commit
+      end
 
-      def solr_url(arg = nil)
-        if(arg != nil)
-          @solr_url = arg
-        end
-        @solr_url
+      def solr_url(url = nil)
+        @solr_url ||= url 
       end
 
       def idx_attrs
-        if @idx_attrs == nil
-          @idx_attrs = {}
-        end
-        @idx_attrs
+        @idx_attrs ||= {}
       end
 
       def idx_assocs
-        if @idx_assocs == nil
-          @idx_assocs = {}
-        end
-        @idx_assocs
+        @idx_assocs ||= {}
       end
     end
 
     module InstanceMethods
-      def index_to_solr(commit = true)
-        if(!self.class.solr_url.nil?)   # There's no point in attempting to index if the solr url isn't specified
+      def index_to_solr
+        if self.class.solr_url   # There's no point in attempting to index if the solr url isn't specified
           fields = get_indexable_fields
-          if(!fields.empty?)            # There's no point in indexing nothing
+          if !fields.empty?            # There's no point in indexing nothing
             solr_conn = RSolr.connect(:url => self.class.solr_url)
             solr_conn.add(fields)
-            if commit
-              solr_conn.commit
-            end
+            solr_conn.commit if self.class.idx_force_commit
           end
         end
       end
       
-      def delete_from_solr(commit = true)
-        if(!self.class.solr_url.nil?)
+      def delete_from_solr
+        if self.class.solr_url
           solr_conn = RSolr.connect(:url => self.class.solr_url)
           solr_conn.delete_by_id(self._id)
-          if commit
-            solr_conn.commit
-          end
+          solr_conn.commit if self.class.idx_force_commit
         end
       end
 
       protected
       def get_indexable_fields
         fields = get_indexable_attributes
-        if self.respond_to?(:associations) 
-          fields.merge!(get_indexable_associations)
-        end
+        fields.merge!(get_indexable_associations) if self.respond_to?(:associations) 
         fields
       end
 
       def get_indexable_attributes
         fields = {}
-        if self.class.idx_attrs != nil
+        if self.class.idx_attrs 
           self.class.idx_attrs.each_pair do |x,y|
             fields[y] = self.attributes[x]
             fields[y] = fields[y].strftime("%Y-%m-%dT%H:%M:%SZ") if fields[y].is_a?(Time)
@@ -111,9 +100,7 @@ module Search
               if x.respond_to?("get_indexable_fields")
                 x_fields = x.get_indexable_fields
                 x_fields.each_pair do |field_name, field_value|
-                  if fields[namespace + field_name.to_s] == nil
-                    fields[namespace + field_name.to_s] = []
-                  end 
+                  fields[namespace + field_name.to_s] = [] if !fields[namespace + field_name.to_s]
                   fields[namespace + field_name.to_s].push(field_value)
                 end
               end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: customized-mongomapper-search
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Thomas Nguyen
@@ -66,7 +66,7 @@ dependencies:
         version: 2.3.11
   type: :runtime
   version_requirements: *id003
-description: Easily integreate mongo mapper with enterprise search like solr.  Based off of the original mongomapper-search gem (version 0.1.0) that written by Fernando Meyer and can be found at http://github.com/fmeyer/mongomapper-search.
+description: Easily integrate Mongo Mapper with with Solr search.  Please view the CHANGELOG file found on the GitHub project homepage before upgrading.
 email: tsxn26@gmail.com
 executables: []
 
@@ -125,6 +125,6 @@ rubyforge_project: customized-mongomapper-search
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Easily integreate mongo mapper with enterprise search like solr.  Based off of the original mongomapper-search gem (version 0.1.0) that written by Fernando Meyer and can be found at http://github.com/fmeyer/mongomapper-search.
+summary: Easily integrate Mongo Mapper with with Solr search.  Please view the CHANGELOG file found on the GitHub project homepage before upgrading.
 test_files: []