erp_search 3.1.0 → 3.1.1

data/README.rdoc

@@ -18,12 +18,12 @@ rake sunspot:solr:start
 Index Content:
 rake sunspot:reindex_content
 
+Index DynamicFormModels:
+rake sunspot:reindex_dynamic_form_models
+
 Index Parties:
 rake sunspot:reindex_party_search_facts
 
-Index Roles:
-rake sunspot:reindex_roles
-
 Stop Solr server:
 rake sunspot:solr:stop  
 

data/app/models/extensions/content.rb

@@ -1,15 +1,10 @@
-Content.class_eval do
-  after_save :sunspot_commit
-  after_destroy :sunspot_commit
+if ErpSearch::Engine::USE_SOLR_FOR_CONTENT
 
-  if $USE_SOLR_FOR_CONTENT
+  Content.class_eval do
+    after_save :sunspot_commit
+    after_destroy :sunspot_commit
 
     searchable do
-      if $USE_TENANCY
-        string :tenant_id do
-          Thread.current[:tenant_id]
-        end
-      end
       text :title
       text :excerpt_html    
       text :body_html
@@ -54,10 +49,6 @@ Content.class_eval do
           with(:website_section_id, website_section_id)
         end
 
-        if $USE_TENANCY
-          with(:tenant_id, Thread.current[:tenant_id])
-        end
-
         with(:website_id, options[:website_id])
         paginate :page => options[:page], :per_page => options[:per_page]
       end
@@ -78,6 +69,7 @@ Content.class_eval do
     def sunspot_commit
       Sunspot.commit    
     end
+      
   end
-    
-end
+
+end

data/app/models/extensions/dynamic_form_document.rb

@@ -1,3 +1,7 @@
-DynamicFormDocument.class_eval do
-  has_dynamic_solr_search
-end
+if ErpSearch::Engine::USE_SOLR_FOR_DYNAMIC_FORM_MODELS
+
+  DynamicFormDocument.class_eval do
+    has_dynamic_solr_search
+  end
+
+end

data/app/models/extensions/party.rb

@@ -1,3 +1,7 @@
-Party.class_eval do
-  has_one :party_search_fact, :dependent => :destroy
-end
+if ErpSearch::Engine::USE_PARTY_SEARCH_FACTS
+
+  Party.class_eval do
+    has_one :party_search_fact, :dependent => :destroy
+  end
+  
+end

data/app/models/extensions/ticket.rb

@@ -1,3 +1,7 @@
-Ticket.class_eval do
-  has_dynamic_solr_search
-end
+if ErpSearch::Engine::USE_SOLR_FOR_DYNAMIC_FORM_MODELS
+
+  Ticket.class_eval do
+    has_dynamic_solr_search
+  end
+
+end

data/app/models/extensions/website_inquiry.rb

@@ -1,3 +1,7 @@
-WebsiteInquiry.class_eval do
-  has_dynamic_solr_search
-end
+if ErpSearch::Engine::USE_SOLR_FOR_DYNAMIC_FORM_MODELS
+
+  WebsiteInquiry.class_eval do
+    has_dynamic_solr_search
+  end
+
+end

data/app/models/party_search_fact.rb

@@ -1,82 +1,86 @@
-class PartySearchFact < ActiveRecord::Base
-  attr_protected :created_at, :updated_at
+if ErpSearch::Engine::USE_PARTY_SEARCH_FACTS
 
-  after_destroy :sunspot_commit
-  
-  belongs_to :party
-  
-  searchable do
-    integer :party_id
-    string :eid    
-    string :type
-    string :roles, :multiple => true do
-      roles.split(/,\s*/) unless roles.nil?
+  class PartySearchFact < ActiveRecord::Base
+    attr_protected :created_at, :updated_at
+
+    after_destroy :sunspot_commit
+    
+    belongs_to :party
+    
+    searchable do
+      integer :party_id
+      string :eid    
+      string :type
+      string :roles, :multiple => true do
+        roles.split(/,\s*/) unless roles.nil?
+      end
+      text :party_description
+      string :party_description
+      string :party_business_party_type    
+      text :user_login
+      text :individual_current_last_name
+      text :individual_current_first_name
+      string :individual_current_middle_name    
+      string :individual_birth_date
+      text :individual_ssn    
+      text :party_phone_number
+      text :party_email_address    
+      string :party_address_1
+      string :party_address_2    
+      string :party_primary_address_city
+      string :party_primary_address_state    
+      text :party_primary_address_zip
+      string :party_primary_address_country    
+      string :user_enabled
+      string :user_type 
     end
-    text :party_description
-    string :party_description
-    string :party_business_party_type    
-    text :user_login
-    text :individual_current_last_name
-    text :individual_current_first_name
-    string :individual_current_middle_name    
-    string :individual_birth_date
-    text :individual_ssn    
-    text :party_phone_number
-    text :party_email_address    
-    string :party_address_1
-    string :party_address_2    
-    string :party_primary_address_city
-    string :party_primary_address_state    
-    text :party_primary_address_zip
-    string :party_primary_address_country    
-    string :user_enabled
-    string :user_type 
-  end
-  
-  def self.update_search_fact(party)    
-    sf = PartySearchFact.find(:first, :conditions => ["party_id = ?", party.id])
+    
+    def self.update_search_fact(party)    
+      sf = PartySearchFact.find(:first, :conditions => ["party_id = ?", party.id])
 
-    sf = PartySearchFact.create(:party_id => party.id) if sf.nil?
-    sf.update_search_fact(party)
-  end
+      sf = PartySearchFact.create(:party_id => party.id) if sf.nil?
+      sf.update_search_fact(party)
+    end
 
-  def self.destroy_search_fact(party)
-    sf = PartySearchFact.find(:first, :conditions => ["party_id = ?", party.id])
+    def self.destroy_search_fact(party)
+      sf = PartySearchFact.find(:first, :conditions => ["party_id = ?", party.id])
 
-    return if sf.nil?
+      return if sf.nil?
 
-    sf.destroy
-  end
+      sf.destroy
+    end
 
-  def update_search_fact(party)
-    self.update_attributes(
-        :party_id => party.id,
-        :eid => party.enterprise_identifier,
-        :roles => (party.user.roles.map { |role| role.internal_identifier }.join(',') rescue ''),
-        :party_description => party.description,
-        :party_business_party_type => party.business_party_type,
-        :user_login => (party.user.username rescue ''),
-        :individual_current_last_name => (party.business_party.current_last_name rescue ''),
-        :individual_current_first_name => (party.business_party.current_first_name rescue ''),
-        :individual_current_middle_name => (party.business_party.current_middle_name rescue ''),
-        :individual_birth_date => (party.business_party.birth_date rescue ''),
-        :individual_ssn => (party.business_party.ssn_last_four rescue ''),
-        :party_phone_number => (party.personal_phone_number.phone_number rescue ''),
-        :party_email_address => (party.personal_email_address.email_address rescue ''),
-        :party_address_1 => (party.home_postal_address.address_line_1 rescue ''),
-        :party_address_2 => (party.home_postal_address.address_line_2 rescue ''),
-        :party_primary_address_city => (party.home_postal_address.city rescue ''),
-        :party_primary_address_state => (party.home_postal_address.state rescue ''),
-        :party_primary_address_zip => (party.home_postal_address.zip rescue ''),
-        :party_primary_address_country => (party.home_postal_address.country rescue ''),
-        :user_enabled => (party.user.enabled rescue false),
-        :user_type => (party.user.attributes['type'] rescue '')
-        )
-    Sunspot.commit
-  end
+    def update_search_fact(party)
+      self.update_attributes(
+          :party_id => party.id,
+          :eid => party.enterprise_identifier,
+          :roles => (party.user.roles.map { |role| role.internal_identifier }.join(',') rescue ''),
+          :party_description => party.description,
+          :party_business_party_type => party.business_party_type,
+          :user_login => (party.user.username rescue ''),
+          :individual_current_last_name => (party.business_party.current_last_name rescue ''),
+          :individual_current_first_name => (party.business_party.current_first_name rescue ''),
+          :individual_current_middle_name => (party.business_party.current_middle_name rescue ''),
+          :individual_birth_date => (party.business_party.birth_date rescue ''),
+          :individual_ssn => (party.business_party.ssn_last_four rescue ''),
+          :party_phone_number => (party.personal_phone_number.phone_number rescue ''),
+          :party_email_address => (party.personal_email_address.email_address rescue ''),
+          :party_address_1 => (party.home_postal_address.address_line_1 rescue ''),
+          :party_address_2 => (party.home_postal_address.address_line_2 rescue ''),
+          :party_primary_address_city => (party.home_postal_address.city rescue ''),
+          :party_primary_address_state => (party.home_postal_address.state rescue ''),
+          :party_primary_address_zip => (party.home_postal_address.zip rescue ''),
+          :party_primary_address_country => (party.home_postal_address.country rescue ''),
+          :user_enabled => (party.user.enabled rescue false),
+          :user_type => (party.user.attributes['type'] rescue '')
+          )
+      Sunspot.commit
+    end
 
-  def sunspot_commit
-    Sunspot.commit    
-  end
+    def sunspot_commit
+      Sunspot.commit    
+    end
 
+  end
+  
 end

data/config/erp_search.yml

@@ -0,0 +1,4 @@
+---
+use_solr_for_content: true
+use_solr_for_dynamic_form_models: true
+use_party_search_facts: true

data/lib/erp_search.rb

@@ -1,14 +1,12 @@
+require 'sunspot_rails'
 require 'erp_base_erp_svcs'
-
-require 'sunspot'
-
-require "erp_search/extensions"
 require "erp_search/version"
 require "erp_search/engine"
 
-
-$USE_SOLR_FOR_CONTENT = true
-$USE_SOLR_FOR_DYNAMIC_FORM_MODELS = true
-
 module ErpSearch
+
+  def self.use_tenancy?
+    Object.const_defined?('Tenancy')
+  end
+  
 end

data/lib/erp_search/config.rb

@@ -0,0 +1,31 @@
+module ErpSearch
+  module Config
+    class << self
+      attr_accessor :use_solr_for_content, :use_solr_for_dynamic_form_models
+
+      def init!
+        @defaults = {
+            :@use_solr_for_content => ErpSearch::Engine::USE_SOLR_FOR_CONTENT, 
+            :@use_solr_for_dynamic_form_models => ErpSearch::Engine::USE_SOLR_FOR_DYNAMIC_FORM_MODELS,
+            :@use_party_search_facts => ErpSearch::Engine::USE_PARTY_SEARCH_FACTS
+        }
+      end
+
+      def reset!
+        @defaults.each do |k, v|
+          instance_variable_set(k, v)
+        end
+      end
+
+      def configure(&blk)
+        @configure_blk = blk
+      end
+
+      def configure!
+        @configure_blk.call(self) if @configure_blk
+      end
+    end
+    init!
+    reset!
+  end
+end

data/lib/erp_search/engine.rb

@@ -1,17 +1,41 @@
-require 'sunspot_rails'
-
 module ErpSearch
   class Engine < Rails::Engine
     isolate_namespace ErpSearch
 
-    ActiveSupport.on_load(:active_record) do
-      include ErpSearch::Extensions::ActiveRecord::HasDynamicSolrSearch
-    end
+    initializer "erp_search.load_app_root" do |app|
+      filename = File.join(app.root,"config/erp_search.yml") 
+      if File.exists?(filename)
+        config = YAML.load_file(filename)
+        USE_SOLR_FOR_CONTENT = (config["use_solr_for_content"].nil? ? true : config["use_solr_for_content"])
+        USE_SOLR_FOR_DYNAMIC_FORM_MODELS = (config["use_solr_for_dynamic_form_models"].nil? ? true : config["use_solr_for_dynamic_form_models"])
+        USE_PARTY_SEARCH_FACTS = (config["use_party_search_facts"].nil? ? true : config["use_party_search_facts"])
+      else
+        USE_SOLR_FOR_CONTENT = true
+        USE_SOLR_FOR_DYNAMIC_FORM_MODELS = true
+        USE_PARTY_SEARCH_FACTS = true
+      end
+
+      require "erp_search/config"
+      ErpSearch::Engine.config.erp_search = ErpSearch::Config
 
-    #add observers
-	  #this is ugly need a better way
-	  observers = [:party_observer, :contact_observer]
-	  (config.active_record.observers.nil?) ? config.active_record.observers = observers : config.active_record.observers += observers
+      ErpSearch::Engine.config.to_prepare do
+        require "erp_search/extensions"
+        ActiveSupport.on_load(:active_record) do
+          include ErpSearch::Extensions::ActiveRecord::HasDynamicSolrSearch
+        end
+      end
+
+      ErpSearch::Engine.config.after_initialize do
+        # setup sunspot for all dynamic form models if we're using USE_SOLR_FOR_DYNAMIC_FORM_MODELS
+        DynamicFormModel.sunspot_setup_all if Object.const_defined?('ErpForms') and ErpForms.use_solr? and ActiveRecord::Base.connection.table_exists?('dynamic_form_models')
+      end
+
+      if USE_PARTY_SEARCH_FACTS
+        # Add observers (this is ugly need a better way)
+        observers = [:party_observer, :contact_observer]
+        (ErpSearch::Engine.config.active_record.observers.nil?) ? ErpSearch::Engine.config.active_record.observers = observers : ErpSearch::Engine.config.active_record.observers += observers
+      end
+    end
 
     ErpBaseErpSvcs.register_as_compass_ae_engine(config, self)
   end

data/lib/erp_search/extensions/active_record/has_dynamic_solr_search.rb

@@ -1,16 +1,13 @@
-# require 'sunspot'
-# Sunspot::Setup.class_eval do
-#   def self.clear_setup_for_class(klass)
-#     Rails.logger.info "clear_setup_for_class"
-#     Sunspot.searchable.delete!(klass)
-#     Rails.logger.info "searchable #{Sunspot.searchable.inspect}"
-#     #Rails.logger.info "field_factories #{field_factories.inspect}"
-#     Rails.logger.info "setups[klass.name.to_sym] #{setups.keys}"
-#     setups.delete_if{|key, value| key == klass.name.to_sym }
-#     #setups[klass.name.to_sym] = new(clazz)
-#     Rails.logger.info "setups[klass.name.to_sym] #{setups.keys}"
-#   end
-# end
+Sunspot::Setup.class_eval do
+  def self.clear_setup_for_class(klass)
+    #Rails.logger.info "clear_setup_for_class"
+    #Sunspot.searchable.delete!(klass)
+    #Rails.logger.info "searchable #{Sunspot.searchable.inspect}"
+    #Rails.logger.info "setups[klass.name.to_sym] #{setups.keys}"
+    setups.delete_if{|key, value| key == klass.name.to_sym }
+    #Rails.logger.info "setups[klass.name.to_sym] #{setups.keys}"
+  end
+end
 
 # Sunspot::ClassSet.class_eval do
 #   def delete!(klass)
@@ -52,7 +49,7 @@ module ErpSearch
 
           def sunspot_setup(options={})
             klass = DynamicFormModel.get_constant(self.name)
-            #Sunspot::Setup.clear_setup_for_class(klass)
+            Sunspot::Setup.clear_setup_for_class(klass)
             definition = DynamicForm.get_form(self.name).definition_object rescue nil
 
             unless definition.nil?

data/lib/erp_search/version.rb

@@ -2,7 +2,7 @@ module ErpSearch
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/lib/tasks/dynamic_form_models.rake

@@ -7,7 +7,6 @@ namespace :sunspot do
       DynamicFormModel.order('id asc').all.each do |m|
         next if m.model_name == 'DynamicFormDocument'
         if m.get_constant.is_searchable?
-          m.get_constant.sunspot_setup
           puts "Indexing #{m.model_name} ..."
           m.get_constant.solr_reindex
           puts "Done."
@@ -21,7 +20,6 @@ namespace :sunspot do
       DynamicFormModel.all.each do |m|
         next if m.model_name == 'DynamicFormDocument'
         if m.get_constant.is_searchable?
-          m.get_constant.sunspot_setup
           puts "Removing Indexes for #{m.model_name} ..."
           m.get_constant.solr_remove_all_from_index!
           puts "Done."
@@ -30,12 +28,11 @@ namespace :sunspot do
     end
   end
 
-
   def use_solr?
-    if $USE_SOLR_FOR_DYNAMIC_FORM_MODELS
+    if ErpSearch::Engine::USE_SOLR_FOR_DYNAMIC_FORM_MODELS
       return true
     else
-      puts "USE_SOLR_FOR_DYNAMIC_FORM_MODELS is off. You likely need to install erp_search."
+      puts "USE_SOLR_FOR_DYNAMIC_FORM_MODELS is off."
       return false
     end
   end

data/lib/tasks/solr_index.rake

@@ -38,91 +38,4 @@ namespace :sunspot do
     puts "Done."
   end
 
-  namespace :tenants do
-    def get_all_tenants
-      # get all tenants
-      tenants = Tenant.all
-      
-      # add public schema if it is in list
-      public_schema = Tenant.new
-      public_schema.id = 0
-      public_schema.schema = 'public'      
-      schemas = tenants.collect{|t| t.schema }
-      tenants << public_schema unless schemas.include?('public')
-      tenants
-    end
-        
-    task :reindex_content => :environment do
-      # loop thru tenants
-      get_all_tenants.each do |t|
-        puts "Indexing #{t.schema} ..."
-        
-        set_current_schema(t.schema)
-        
-        remove_tenant_indexes(Content, t.id)
-        
-        # reindex content for tenant
-        Content.solr_index
-        Sunspot.commit
-      end
-      
-      puts "Done."
-    end
-    
-    task :delete_content => :environment do      
-      puts "Removing Indexes for All Tenants! ..."
-      Content.solr_remove_all_from_index!
-      puts "Done."
-    end
-  end
-  
-  def get_tenant_id_by_schema(schema)
-    tenant_id = Tenant.find_by_schema(schema).id rescue 0
-    puts "tenant id is zero which means public schema!" if tenant_id == 0    
-    return tenant_id
-  end
-  
-  def set_current_schema(schema)
-    # set current tenant_id in Thread
-    if schema == 'public'
-      Thread.current[:tenant_id] = 0
-    else
-      Thread.current[:tenant_id] = get_tenant_id_by_schema(schema)
-    end      
-
-    #set schema
-    Tenancy::SchemaUtil.set_search_path(schema)  
-  end
-  
-  def remove_tenant_indexes(object, tenant_id)
-    # remove by query
-    Sunspot.remove(object) do
-      with(:tenant_id).equal_to(tenant_id)
-    end      
-    Sunspot.commit
-  end
-    
-  namespace :tenant do
-    task :reindex_content, [:schema] => :environment do |t,args|
-      puts "Indexing #{args.schema} ..."
-      
-      set_current_schema(args.schema)
-            
-      remove_tenant_indexes(Content, get_tenant_id_by_schema(args.schema))
-      
-      Content.solr_index     
-      Sunspot.commit
-      puts "Done."
-    end
-
-    task :delete_content, [:schema] => :environment do |t,args|
-      puts "Removing Indexes ..."
-      
-      set_current_schema(args.schema)
-            
-      remove_tenant_indexes(Content, get_tenant_id_by_schema(args.schema))      
-      puts "Done."
-    end
-  end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_search
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knitkit
@@ -104,9 +104,11 @@ files:
 - app/observers/phone_number_observer.rb
 - app/observers/postal_address_observer.rb
 - app/views/layouts/erp_search/application.html.erb
+- config/erp_search.yml
 - config/routes.rb
 - config/sunspot.yml
 - db/migrate/20110817165116_recreate_party_search_facts_table.rb
+- lib/erp_search/config.rb
 - lib/erp_search/engine.rb
 - lib/erp_search/extensions/active_record/has_dynamic_solr_search.rb
 - lib/erp_search/extensions.rb
@@ -226,18 +228,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3467136001356662011
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3467136001356662011
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24