muck-friends 3.0.2 → 3.0.3

data/.gitignore

@@ -27,4 +27,5 @@ rdoc
 pkg
 pkg/*
 log/*
-secrets.yml
+secrets.yml
+log/*

data/VERSION

@@ -1 +1 @@
-3.0.2
+3.0.3

data/muck-friends.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-friends}
-  s.version = "3.0.2"
+  s.version = "3.0.3"
 
   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{Friend engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -25,10 +25,10 @@ Gem::Specification.new do |s|
      "app/helpers/muck_friends_helper.rb",
      "app/views/activity_templates/_follow.erb",
      "app/views/activity_templates/_friends_with.erb",
-     "app/views/friend_mailer/follow.text.html.erb",
-     "app/views/friend_mailer/follow.text.plain.erb",
+     "app/views/friend_mailer/follow.html.erb",
+     "app/views/friend_mailer/follow.text.erb",
      "app/views/friend_mailer/friend_request.html.erb",
-     "app/views/friend_mailer/friend_request.plain.erb",
+     "app/views/friend_mailer/friend_request.text.erb",
      "app/views/friends/_all_friends.html.erb",
      "app/views/friends/_friend_icon.html.erb",
      "app/views/friends/_friend_requests.html.erb",
@@ -165,8 +165,6 @@ Gem::Specification.new do |s|
      "test/rails_test/lib/tasks/.gitkeep",
      "test/rails_test/lib/tasks/cucumber.rake",
      "test/rails_test/log/cucumber.log",
-     "test/rails_test/log/development.log",
-     "test/rails_test/log/test.log",
      "test/rails_test/public/.htaccess",
      "test/rails_test/public/404.html",
      "test/rails_test/public/422.html",

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

@@ -26,7 +26,7 @@ PATH
 PATH
   remote: /Users/jbasdf/projects/muck-contents
   specs:
-    muck-contents (3.0.1)
+    muck-contents (3.0.2)
       acts-as-taggable-on
       awesome_nested_set
       babelphish
@@ -41,7 +41,7 @@ PATH
 PATH
   remote: /Users/jbasdf/projects/muck-engine
   specs:
-    muck-engine (3.0.3)
+    muck-engine (3.0.6)
       overlord
       validation_reflection
       will_paginate (~> 3.0.beta)
@@ -49,7 +49,7 @@ PATH
 PATH
   remote: /Users/jbasdf/projects/muck-friends
   specs:
-    muck-friends (3.0.0)
+    muck-friends (3.0.2)
       muck-engine
       muck-profiles
       muck-users
@@ -57,7 +57,7 @@ PATH
 PATH
   remote: /Users/jbasdf/projects/muck-profiles
   specs:
-    muck-profiles (3.0.1)
+    muck-profiles (3.0.2)
       geokit
       muck-comments
       muck-contents
@@ -73,11 +73,11 @@ PATH
 PATH
   remote: /Users/jbasdf/projects/muck-users
   specs:
-    muck-users (3.0.3)
+    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
@@ -88,12 +88,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)
@@ -101,19 +101,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)
@@ -129,28 +129,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)
@@ -161,22 +164,23 @@ 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 (3.0.0)
     muck-shares (3.0.1)
@@ -184,15 +188,16 @@ GEM
       muck-comments
       muck-engine
       muck-users
-    muck-solr (0.4.7)
+    muck-solr (3.0.1)
     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
@@ -281,7 +288,7 @@ DEPENDENCIES
   muck-users!
   mysql
   overlord
-  rails (= 3.0.0)
+  rails (= 3.0.1)
   rcov
   rspec (>= 2.0.0)
   rspec-rails (>= 2.0.0)

data/test/rails_test/config/initializers/muck.rb

@@ -55,6 +55,7 @@ end
 
 MuckProfiles.configure do |config|
   config.enable_solr = false           # This enables or disables acts as solr for profiles.
+  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_geokit = false         # Turn geokit functionality on/off.
   config.enable_guess_location = false # 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/test/rails_test/spec/mailers/friend_mailer_spec.rb

@@ -20,9 +20,8 @@ describe FriendMailer do
   it "should send friend_request email" do
     inviter = Factory(:user)
     invited = Factory(:user)
-    response = FriendMailer.deliver_friend_request(inviter, invited)
+    email = FriendMailer.friend_request(inviter, invited).deliver
     ActionMailer::Base.deliveries.should_not be_empty
-    email = ActionMailer::Base.deliveries.last
     email.to.should == [invited.email]
     email.from.should == [MuckEngine.configuration.from_email]
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-friends
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 3
   - 0
-  - 2
-  version: 3.0.2
+  - 3
+  version: 3.0.3
 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 
@@ -79,10 +79,10 @@ files:
 - app/helpers/muck_friends_helper.rb
 - app/views/activity_templates/_follow.erb
 - app/views/activity_templates/_friends_with.erb
-- app/views/friend_mailer/follow.text.html.erb
-- app/views/friend_mailer/follow.text.plain.erb
+- app/views/friend_mailer/follow.html.erb
+- app/views/friend_mailer/follow.text.erb
 - app/views/friend_mailer/friend_request.html.erb
-- app/views/friend_mailer/friend_request.plain.erb
+- app/views/friend_mailer/friend_request.text.erb
 - app/views/friends/_all_friends.html.erb
 - app/views/friends/_friend_icon.html.erb
 - app/views/friends/_friend_requests.html.erb
@@ -219,8 +219,6 @@ files:
 - test/rails_test/lib/tasks/.gitkeep
 - test/rails_test/lib/tasks/cucumber.rake
 - test/rails_test/log/cucumber.log
-- test/rails_test/log/development.log
-- test/rails_test/log/test.log
 - test/rails_test/public/.htaccess
 - test/rails_test/public/404.html
 - test/rails_test/public/422.html