muck-profiles 3.0.1 → 3.0.2

data/README.rdoc

@@ -79,6 +79,7 @@ Your user model will now appear to have a 'photo' which is delegated to the prof
 Create an initializer to configure muck profiles:
 
   MuckProfiles.configure do |config|
+    config.enable_sunspot = false       # This enables or disables sunspot for profiles. Only use acts_as_solr or sunspot not both. Sunspot does not include multicore support.
     config.enable_solr = true           # This enables or disables acts as solr for profiles.
     config.enable_guess_location = true # If true the profile system will attempt to determine the user's location via IP and populated with the location, lat and lon fields.
   end
@@ -87,10 +88,11 @@ Create an initializer to configure muck profiles:
 Muck Profiles works with solr to allow searching users. 
 
   
-If you enable acts as solr you'll also want to specify a default policy in your configuration.  This policy is used to determine which fields are public and private.
+If you enable acts_as_solr or sunspot you'll also want to specify a default policy in your configuration.  This policy is used to determine which fields are public and private.
 The default policy looks like this:
 
   MuckProfiles.configure do |config|
+    config.enable_sunspot = false       # This enables or disables sunspot for profiles. Only use acts_as_solr or sunspot not both. Sunspot does not include multicore support.
     config.enable_solr = true           # This enables or disables acts as solr for profiles.
     config.enable_geokit = true         # Turn geokit functionality on/off.
     config.enable_guess_location = true # If true the profile system will attempt to determine the user's location via IP and populated with the location, lat and lon fields.
@@ -105,6 +107,7 @@ If you add attributes to the profile as show below then you will want to specify
 possible to add new privacy levels simply by adding new values to the hash.  For example:
 
   MuckProfiles.configure do |config|
+    config.enable_sunspot = false       # This enables or disables sunspot for profiles. Only use acts_as_solr or sunspot not both. Sunspot does not include multicore support.
     config.enable_solr = true           # This enables or disables acts as solr for profiles.
     config.enable_guess_location = true # If true the profile system will attempt to determine the user's location via IP and populated with the location, lat and lon fields.
     config.policy => { :public => [:login, :first_name, :last_name, :about],

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.2

data/app/controllers/muck/profiles_controller.rb

@@ -14,9 +14,21 @@ class Muck::ProfilesController < ApplicationController
     @query = params[:q]
     @page = (params[:page] || 1).to_i
     @rows = (params[:rows] || 10).to_i
-    results = Profile.find_by_solr(@query, :limit => @rows, :offset => @rows*(@page-1), :core => 'en')
-    @hit_count = results.total
-    @users = results.results.paginate(:page => @page, :per_page => @rows, :total_entries => @hit_count)
+    if MuckProfile.configuration.enable_solr
+      results = Profile.find_by_solr(@query, :limit => @rows, :offset => @rows*(@page-1), :core => 'en')
+      @hit_count = results.total
+      @users = results.results.paginate(:page => @page, :per_page => @rows, :total_entries => @hit_count)
+    elsif MuckProfile.configuration.enable_sunspot
+      results = Sunspot.search Profile do
+        keywords @query
+        paginate :page => @page, :per_page => @per_page
+      end      
+      @hit_count = results.total
+      @users = results.results.paginate(:page => @page, :per_page => @rows, :total_entries => @hit_count)
+    else
+      raise translate('muck.profiles.search_not_enabled')
+    end
+    
     respond_to do |format|
       format.html { render :template => 'profiles/index' }
     end

data/config/locales/en.yml

@@ -25,4 +25,5 @@ en:
       country_help: "Enter your current current."
       language_help: "Enter your primary language"
       location_suggestion: "We think you're in %{location}."
-      click_to_set: "Click to set this as your location."
+      click_to_set: "Click to set this as your location."
+      search_not_enabled: "Search not enabled for profiles. Set either enable_solr or enable_sunspot to true in your profile configuration." 

data/lib/muck-profiles/config.rb

@@ -13,13 +13,14 @@ module MuckProfiles
   end
 
   class Configuration
-    
+    attr_accessor :enable_sunspot         # This enables or disables sunspot for profiles. Only use acts_as_solr or sunspot not both. Sunspot does not include multicore support.
     attr_accessor :enable_solr            # This enables or disables acts as solr for profiles.
     attr_accessor :enable_geokit          # Turn geokit functionality on/off
     attr_accessor :enable_guess_location  # If true the profile system will attempt to determine the user's location via IP and populated with the location, lat and lon fields.
     attr_accessor :policy
     
     def initialize
+      self.enable_sunspot = false
       self.enable_solr = true
       self.enable_guess_location = true
       self.policy = { :public => [:login, :first_name, :last_name, :about],

data/lib/muck-profiles/models/profile.rb

@@ -32,13 +32,13 @@ module MuckProfiles
 
         acts_as_mappable if MuckProfiles.configuration.enable_geokit
         
-        if MuckProfiles.configuration.enable_solr
+        if MuckProfiles.configuration.enable_solr || MuckProfiles.configuration.enable_sunspot
           fields = []
           MuckProfiles.configuration.policy.keys.each do |key|
             field_name = "#{key}_fields"
             fields << {field_name.to_sym, :text}
             # Setup a method for each key in the policy that can generate a string of all the fields
-            # associated with that key.  acts_as_solr will call this method.
+            # associated with that key.  acts_as_solr or sunspot will call this method.
             instance_eval do
               define_method field_name do
                 MuckProfiles.configuration.policy[key].collect{ |attribute| self.send(attribute) }.join(' ')
@@ -48,8 +48,17 @@ module MuckProfiles
           write_inheritable_array(:solr_fields, fields)
           write_inheritable_hash(:default_policy, MuckProfiles.configuration.policy)
 
-          require 'acts_as_solr'
-          acts_as_solr( {:fields => fields}, {:multi_core => true, :default_core => 'en'})
+          if MuckProfiles.configuration.enable_solr
+            require 'acts_as_solr'
+            acts_as_solr( {:fields => fields}, {:multi_core => true, :default_core => 'en'})
+          elsif MuckProfiles.configuration.enable_sunspot
+            require 'sunspot'
+            searchable do
+              fields.each do |field|
+                text field
+              end
+            end
+          end
         end
 
         attr_protected :created_at, :updated_at, :photo_file_name, :photo_content_type, :photo_file_size

data/muck-profiles.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-profiles}
-  s.version = "3.0.1"
+  s.version = "3.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-10-18}
+  s.date = %q{2010-10-27}
   s.description = %q{Profile engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

data/test/rails_test/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", "3.0.0" #, :path => "~/projects/other_apps/rails"
+gem "rails", "3.0.1" #, :path => "~/projects/other_apps/rails"
 gem "mysql"
 
 # gem "authlogic"

data/test/rails_test/Gemfile.lock

@@ -14,7 +14,7 @@ PATH
 PATH
   remote: /Users/jbasdf/projects/muck-activities
   specs:
-    muck-activities (3.0.0)
+    muck-activities (3.0.1)
       muck-comments
       muck-engine
       muck-users
@@ -22,7 +22,7 @@ PATH
 PATH
   remote: /Users/jbasdf/projects/muck-comments
   specs:
-    muck-comments (3.0.1)
+    muck-comments (3.0.2)
       muck-engine
       muck-users
       nested_set
@@ -31,7 +31,7 @@ PATH
 PATH
   remote: /Users/jbasdf/projects/muck-contents
   specs:
-    muck-contents (3.0.0)
+    muck-contents (3.0.1)
       acts-as-taggable-on
       awesome_nested_set
       babelphish
@@ -46,7 +46,7 @@ PATH
 PATH
   remote: /Users/jbasdf/projects/muck-engine
   specs:
-    muck-engine (3.0.1)
+    muck-engine (3.0.6)
       overlord
       validation_reflection
       will_paginate (~> 3.0.beta)
@@ -54,7 +54,7 @@ PATH
 PATH
   remote: /Users/jbasdf/projects/muck-profiles
   specs:
-    muck-profiles (3.0.0)
+    muck-profiles (3.0.1)
       geokit
       muck-comments
       muck-contents
@@ -70,7 +70,7 @@ PATH
 PATH
   remote: /Users/jbasdf/projects/muck-shares
   specs:
-    muck-shares (3.0.0)
+    muck-shares (3.0.1)
       muck-activities
       muck-comments
       muck-engine
@@ -79,11 +79,11 @@ PATH
 PATH
   remote: /Users/jbasdf/projects/muck-users
   specs:
-    muck-users (3.0.0)
+    muck-users (3.0.5)
       authlogic
       bcrypt-ruby
       friendly_id
-      muck-engine
+      muck-engine (>= 3.0.3)
 
 PATH
   remote: /Users/jbasdf/projects/other_apps/shoulda
@@ -94,12 +94,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
+    actionmailer (3.0.1)
+      actionpack (= 3.0.1)
       mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
@@ -107,19 +107,19 @@ GEM
       rack-mount (~> 0.6.12)
       rack-test (~> 0.5.4)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
     acts-as-taggable-on (2.0.6)
     arel (1.0.1)
       activesupport (~> 3.0.0)
@@ -135,28 +135,31 @@ GEM
     babosa (0.2.0)
     bcrypt-ruby (2.1.2)
     builder (2.1.2)
-    capybara (0.3.9)
+    capybara (0.4.0)
+      celerity (>= 0.7.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.3)
-    childprocess (0.0.7)
+      selenium-webdriver (>= 0.0.27)
+      xpath (~> 0.1.2)
+    celerity (0.8.2)
+    childprocess (0.1.3)
       ffi (~> 0.6.3)
     columnize (0.3.1)
     configuration (1.1.0)
     crack (0.1.8)
-    cucumber (0.9.2)
+    cucumber (0.9.3)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.5)
+      gherkin (~> 2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
     culerity (0.2.12)
-    database_cleaner (0.5.2)
+    database_cleaner (0.6.0)
     diff-lcs (1.1.2)
     disguise (3.0.2)
     erubis (2.6.6)
@@ -167,32 +170,34 @@ GEM
     friendly_id (3.1.7)
       babosa (~> 0.2.0)
     geokit (1.5.0)
-    gherkin (2.2.8)
+    gherkin (2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     httparty (0.6.1)
       crack (= 0.1.8)
-    i18n (0.4.1)
+    i18n (0.4.2)
     json (1.4.6)
     json_pure (1.4.6)
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
     linecache (0.43)
-    mail (2.2.7)
+    mail (2.2.9)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (~> 0.4.1)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
-    muck-raker (0.3.18)
+    muck-raker (3.0.0)
     mysql (2.8.1)
     nested_set (1.5.2)
       activerecord (>= 3.0.0)
       railties (>= 3.0.0)
     nokogiri (1.4.3.1)
-    overlord (3.0.1)
+    overlord (3.0.2)
       httparty
-    paperclip (2.3.4)
+      json
+    paperclip (2.3.5)
       activerecord
       activesupport
     polyglot (0.3.1)
@@ -201,33 +206,33 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
+    rails (3.0.1)
+      actionmailer (= 3.0.1)
+      actionpack (= 3.0.1)
+      activerecord (= 3.0.1)
+      activeresource (= 3.0.1)
+      activesupport (= 3.0.1)
       bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
+      railties (= 3.0.1)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-    rspec-rails (2.0.0)
-      rspec (= 2.0.0)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    rspec-rails (2.0.1)
+      rspec (~> 2.0.0)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.3.0)
@@ -256,6 +261,8 @@ GEM
     validation_reflection (1.0.0)
     will_paginate (3.0.pre2)
     xml-simple (1.0.12)
+    xpath (0.1.2)
+      nokogiri (~> 1.3)
     ya2yaml (0.30)
 
 PLATFORMS
@@ -282,7 +289,7 @@ DEPENDENCIES
   muck-users!
   mysql
   overlord
-  rails (= 3.0.0)
+  rails (= 3.0.1)
   rcov
   rspec (>= 2.0.0)
   rspec-rails (>= 2.0.0)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-profiles
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 -06:00
+date: 2010-10-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency