muck-profiles 3.0.0 → 3.0.1

data/README.rdoc

@@ -7,9 +7,9 @@ total customization of the user's profile information including privacy settings
 Muck profile relies upon the muck-engine and muck-users gems as well as paperclip.  Add the following lines to your Gemfile:
 
   gem 'paperclip'
-  gem 'muck-engine', :require => 'muck_engine'
-  gem 'muck-users', :require => 'muck_users'
-  gem 'muck-profiles', :require => 'muck_profiles'
+  gem 'muck-engine'
+  gem 'muck-users'
+  gem 'muck-profiles'
   gem 'geokit' # Only needed if you want to add location to your profiles. MuckProfiles uses geokit to determine a users
                # location and to make it possible to find users that are within a given proximity.
 
@@ -33,7 +33,7 @@ secrets.yml file and then add the following to environment.rb right above Rails:
 
   require 'ostruct'
   require 'yaml'
-  ::Secrets = OpenStruct.new(YAML.load_file(File.expand_path('../secrets.yml', __FILE__))[Rails.env.to_sym])
+  ::Secrets = OpenStruct.new(YAML.load_file(File.expand_path('../secrets.yml', __FILE__))[Rails.env])
 
 Omit secrets.yml from your version control system and use it to keep sensitive data like email server credentials
 

data/Rakefile

@@ -1,9 +1,14 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'rspec/core/rake_task'
 
-desc 'Default: run tests.'
+desc 'Default: run specs.'
 task :default => :spec
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ["--color", "-c", "-f progress", "-r test/rails_test/spec/spec_helper.rb"]
+  t.pattern = 'test/rails_test/spec/**/*_spec.rb'  
+end
 
 begin
   require 'rcov/rcovtask'
@@ -21,7 +26,7 @@ rescue LoadError
   end
 end
 
-desc 'Generate documentation for the muck_profiles plugin.'
+desc 'Generate documentation for the muck-profiles plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'MuckProfiles'
@@ -42,7 +47,7 @@ begin
     gemspec.name = "muck-profiles"
     gemspec.summary = "Profile engine for the muck system"
     gemspec.email = "justin@tatemae.com"
-    gemspec.homepage = "http://github.com/tatemae/muck_profiles"
+    gemspec.homepage = "http://github.com/tatemae/muck-profiles"
     gemspec.description = "Profile engine for the muck system."
     gemspec.authors = ["Justin Ball", "Joel Duffin"]
     gemspec.rubyforge_project = 'muck-profiles'

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/lib/muck-profiles.rb

@@ -0,0 +1,10 @@
+require 'paperclip'
+require 'sanitize'
+require 'muck-engine'
+require 'muck-users'
+require 'muck-contents'
+
+require 'muck-profiles/config'
+require 'muck-profiles/models/profile'
+require 'muck-profiles/models/user'
+require 'muck-profiles/engine'

data/lib/{muck_profiles → muck-profiles}/engine.rb

@@ -1,4 +1,4 @@
-require 'muck_profiles'
+require 'muck-profiles'
 require 'rails'
 
 module MuckProfiles
@@ -8,13 +8,13 @@ module MuckProfiles
       'muck-profiles'
     end
     
-    initializer 'muck_profiles.helpers' do |app|
+    initializer 'muck-profiles.helpers' do |app|
       ActiveSupport.on_load(:action_view) do
         include MuckProfilesHelper
       end
     end
     
-    initializer 'muck_profiles.i18n' do |app|
+    initializer 'muck-profiles.i18n' do |app|
       ActiveSupport.on_load(:i18n) do
         I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', '..', 'config', 'locales', '*.{rb,yml}') ]
       end

data/lib/{muck_profiles → muck-profiles}/models/profile.rb

@@ -65,7 +65,7 @@ module MuckProfiles
         if MuckProfiles.configuration.enable_guess_location && self.user.current_login_ip
           location = Geokit::Geocoders::MultiGeocoder.geocode(self.user.current_login_ip)
           state = State.find_by_abbreviation(location.state)
-          country = Country.find_by_abbreviation(location.country)
+          country = Country.find_by_abbreviation(location.country_code)
           self.update_attributes(
             :location => "#{location.city}, #{location.state || location.province} #{location.country_code}",
             :lat => location.lat,

data/muck-profiles.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-profiles}
-  s.version = "3.0.0"
+  s.version = "3.0.1"
 
   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-12}
+  s.date = %q{2010-10-18}
   s.description = %q{Profile engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -82,11 +82,11 @@ Gem::Specification.new do |s|
      "db/migrate/20091124203137_add_location_to_profiles.rb",
      "db/migrate/20091124205819_add_fields_to_profiles.rb",
      "db/migrate/20100206000906_remove_name_fields.rb",
-     "lib/muck_profiles.rb",
-     "lib/muck_profiles/config.rb",
-     "lib/muck_profiles/engine.rb",
-     "lib/muck_profiles/models/profile.rb",
-     "lib/muck_profiles/models/user.rb",
+     "lib/muck-profiles.rb",
+     "lib/muck-profiles/config.rb",
+     "lib/muck-profiles/engine.rb",
+     "lib/muck-profiles/models/profile.rb",
+     "lib/muck-profiles/models/user.rb",
      "lib/tasks/muck_profiles.rake",
      "muck-profiles.gemspec",
      "test/rails_test/.gitignore",
@@ -2194,8 +2194,6 @@ Gem::Specification.new do |s|
      "test/rails_test/spec/models/profile_spec.rb",
      "test/rails_test/spec/models/user_spec.rb",
      "test/rails_test/spec/spec_helper.rb",
-     "test/rails_test/test/performance/browsing_test.rb",
-     "test/rails_test/test/test_helper.rb",
      "test/rails_test/vendor/plugins/.gitkeep",
      "test/rails_test/vendor/plugins/geokit-rails/CHANGELOG.rdoc",
      "test/rails_test/vendor/plugins/geokit-rails/MIT-LICENSE",
@@ -2240,7 +2238,7 @@ Gem::Specification.new do |s|
      "test/rails_test/vendor/plugins/geokit-rails/test/tasks.rake",
      "test/rails_test/vendor/plugins/geokit-rails/test/test_helper.rb"
   ]
-  s.homepage = %q{http://github.com/tatemae/muck_profiles}
+  s.homepage = %q{http://github.com/tatemae/muck-profiles}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{muck-profiles}
@@ -2311,8 +2309,6 @@ Gem::Specification.new do |s|
      "test/rails_test/spec/models/profile_spec.rb",
      "test/rails_test/spec/models/user_spec.rb",
      "test/rails_test/spec/spec_helper.rb",
-     "test/rails_test/test/performance/browsing_test.rb",
-     "test/rails_test/test/test_helper.rb",
      "test/rails_test/vendor/plugins/geokit-rails/init.rb",
      "test/rails_test/vendor/plugins/geokit-rails/install.rb",
      "test/rails_test/vendor/plugins/geokit-rails/lib/geokit-rails/acts_as_mappable.rb",

data/test/rails_test/Gemfile

@@ -6,24 +6,27 @@ gem "mysql"
 # gem "authlogic"
 # TODO this is temporary until the official authlogic gem is updated for rails 3
 gem "authlogic", :git => "git://github.com/odorcicd/authlogic.git", :branch => "rails3"
-gem 'will_paginate', "~> 3.0.pre2"
+
 
 gem "disguise"
 gem "bcrypt-ruby", :require => "bcrypt"
 gem "overlord"
 
-gem "muck-engine", :require => "muck_engine", :path => "~/projects/muck-engine"
-gem "muck-users", :require => "muck_users", :path => "~/projects/muck-users"
-gem "muck-shares", :require => 'muck_shares', :path => "~/projects/muck-shares"
+gem "muck-engine", :path => "~/projects/muck-engine"
+gem "muck-users", :path => "~/projects/muck-users"
+gem "muck-shares", :path => "~/projects/muck-shares"
 gem 'muck-solr', :require => 'acts_as_solr', :path => "~/projects/acts_as_solr"
-gem "muck-profiles", :require => "muck_profiles", :path => "../../"
+gem "muck-contents", :path => "~/projects/muck-contents"
+gem 'muck-comments', :path => "~/projects/muck-comments"
+gem 'muck-activities', :path => "~/projects/muck-activities"
+gem "muck-profiles", :path => "../../"
 
 if RUBY_VERSION < "1.9"
   gem "ruby-debug"
 end
 
 group :test, :development do
-  gem "rspec-rails", ">=2.0.0.beta.22"
+  gem "rspec-rails", ">=2.0.0"
   gem "cucumber-rails"
 end
 
@@ -35,7 +38,7 @@ group :test do
   gem "factory_girl"
   gem "cucumber"
   gem "rcov"
-  gem "rspec", ">=2.0.0.beta.22"
+  gem "rspec", ">=2.0.0"
   gem "database_cleaner"
   gem "spork"
   gem "launchy"

data/test/rails_test/Gemfile.lock

@@ -11,13 +11,45 @@ PATH
   specs:
     muck-solr (0.4.7)
 
+PATH
+  remote: /Users/jbasdf/projects/muck-activities
+  specs:
+    muck-activities (3.0.0)
+      muck-comments
+      muck-engine
+      muck-users
+
+PATH
+  remote: /Users/jbasdf/projects/muck-comments
+  specs:
+    muck-comments (3.0.1)
+      muck-engine
+      muck-users
+      nested_set
+      sanitize
+
+PATH
+  remote: /Users/jbasdf/projects/muck-contents
+  specs:
+    muck-contents (3.0.0)
+      acts-as-taggable-on
+      awesome_nested_set
+      babelphish
+      friendly_id
+      muck-comments
+      muck-engine
+      muck-users
+      sanitize
+      tiny_mce
+      uploader
+
 PATH
   remote: /Users/jbasdf/projects/muck-engine
   specs:
     muck-engine (3.0.1)
       overlord
-      validation_reflection (>= 1.0.0.rc.1)
-      will_paginate
+      validation_reflection
+      will_paginate (~> 3.0.beta)
 
 PATH
   remote: /Users/jbasdf/projects/muck-profiles
@@ -99,7 +131,6 @@ GEM
       mime-types
       xml-simple
     babelphish (0.2.8)
-      json
       ya2yaml
     babosa (0.2.0)
     bcrypt-ruby (2.1.2)
@@ -111,10 +142,12 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.3)
+    childprocess (0.0.7)
+      ffi (~> 0.6.3)
     columnize (0.3.1)
     configuration (1.1.0)
     crack (0.1.8)
-    cucumber (0.9.1)
+    cucumber (0.9.2)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
       gherkin (~> 2.2.5)
@@ -134,10 +167,9 @@ GEM
     friendly_id (3.1.7)
       babosa (~> 0.2.0)
     geokit (1.5.0)
-    gherkin (2.2.5)
+    gherkin (2.2.8)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
-      trollop (~> 1.16.2)
     httparty (0.6.1)
       crack (= 0.1.8)
     i18n (0.4.1)
@@ -147,31 +179,11 @@ GEM
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
     linecache (0.43)
-    mail (2.2.6.1)
+    mail (2.2.7)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
     mime-types (1.16)
-    muck-activities (3.0.0)
-      muck-comments
-      muck-engine
-      muck-users
-    muck-comments (3.0.1)
-      muck-engine
-      muck-users
-      nested_set
-      sanitize
-    muck-contents (3.0.0)
-      acts-as-taggable-on
-      awesome_nested_set
-      babelphish
-      friendly_id
-      muck-comments
-      muck-engine
-      muck-users
-      sanitize
-      tiny_mce
-      uploader
     muck-raker (0.3.18)
     mysql (2.8.1)
     nested_set (1.5.2)
@@ -204,18 +216,18 @@ GEM
       thor (~> 0.14.0)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
+    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)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-    rspec-rails (2.0.0.beta.22)
-      rspec (= 2.0.0.beta.22)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+    rspec-rails (2.0.0)
+      rspec (= 2.0.0)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.3.0)
@@ -224,19 +236,19 @@ GEM
     rubyzip (0.9.4)
     sanitize (1.2.1)
       nokogiri (~> 1.4.1)
-    selenium-webdriver (0.0.28)
-      ffi (>= 0.6.1)
+    selenium-webdriver (0.0.29)
+      childprocess (>= 0.0.7)
+      ffi (~> 0.6.3)
       json_pure
       rubyzip
     spork (0.8.4)
     term-ansicolor (1.0.5)
-    thor (0.14.2)
+    thor (0.14.3)
     tiny_mce (0.1.4)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
-    trollop (1.16.2)
     tzinfo (0.3.23)
-    uploader (3.0.1)
+    uploader (3.0.2)
       aws-s3
       mime-types
       paperclip
@@ -260,6 +272,9 @@ DEPENDENCIES
   disguise
   factory_girl
   launchy
+  muck-activities!
+  muck-comments!
+  muck-contents!
   muck-engine!
   muck-profiles!
   muck-shares!
@@ -269,9 +284,8 @@ DEPENDENCIES
   overlord
   rails (= 3.0.0)
   rcov
-  rspec (>= 2.0.0.beta.22)
-  rspec-rails (>= 2.0.0.beta.22)
+  rspec (>= 2.0.0)
+  rspec-rails (>= 2.0.0)
   ruby-debug
   shoulda!
   spork
-  will_paginate (~> 3.0.pre2)

data/test/rails_test/config/application.rb

@@ -9,7 +9,7 @@ Bundler.require(:default, Rails.env) if defined?(Bundler)
 require 'ostruct'
 require 'yaml'
 
-::Secrets = OpenStruct.new(YAML.load_file(File.expand_path('../secrets.yml', __FILE__))[Rails.env.to_sym])
+::Secrets = OpenStruct.new(YAML.load_file(File.expand_path('../secrets.yml', __FILE__))[Rails.env])
 
 module RailsTest
   class Application < Rails::Application

data/test/rails_test/public/javascripts/tiny_mce/templates/country.htm

@@ -13,7 +13,7 @@
 	<div class="country">
 	
 		<h1>{Country Name}</h1>
-		<img class="alignnone" src="<%=GlobalConfig.website_home_url%>/wp-content/uploads/2008/08/boy-on-tire1.jpg" border="0" title="boy-on-tire1" width="210" height="300" />
+		<img class="alignnone" src="<%=MuckEngine.configuration.application_url%>/wp-content/uploads/2008/08/boy-on-tire1.jpg" border="0" title="boy-on-tire1" width="210" height="300" />
 	
 		<h2>Background</h2>
 		<p>{Provide background about the country.}</p>

data/test/rails_test/spec/models/profile_spec.rb

@@ -66,6 +66,24 @@ describe Profile do
     
   end
 
+  describe "guess_and_assign_location_via_ip" do
+    before(:each) do
+      @user = Factory(:user, :current_login_ip => '129.123.54.100')
+      @profile = @user.profile
+      @state = Factory(:state, :abbreviation => 'UT')
+      @country = Factory(:country, :abbreviation => 'US')
+    end
+    it "should find a location for the given IP" do
+      @profile.guess_and_assign_location_via_ip
+      @profile.location.should include('Logan')
+      @profile.lat.should_not be_blank
+      @profile.lng.should_not be_blank
+      @profile.city.should_not be_blank
+      @profile.state.should == @state
+      @profile.country.should == @country
+    end
+  end
+  
   def get_fields_string(profile, fields)
     fields.collect{ |f| profile.send(f) }.join(' ')
   end

data/test/rails_test/spec/spec_helper.rb

@@ -1,29 +1,5 @@
 $:.reject! { |e| e.include? 'TextMate' }
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-require 'muck_test_helper'
 
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
-
-RSpec.configure do |config|
-  # == Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-  config.mock_with :rspec
-
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = true
-  
-end
+require 'muck_test_helper'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-profiles
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -06:00
+date: 2010-10-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -248,11 +248,11 @@ files:
 - db/migrate/20091124203137_add_location_to_profiles.rb
 - db/migrate/20091124205819_add_fields_to_profiles.rb
 - db/migrate/20100206000906_remove_name_fields.rb
-- lib/muck_profiles.rb
-- lib/muck_profiles/config.rb
-- lib/muck_profiles/engine.rb
-- lib/muck_profiles/models/profile.rb
-- lib/muck_profiles/models/user.rb
+- lib/muck-profiles.rb
+- lib/muck-profiles/config.rb
+- lib/muck-profiles/engine.rb
+- lib/muck-profiles/models/profile.rb
+- lib/muck-profiles/models/user.rb
 - lib/tasks/muck_profiles.rake
 - muck-profiles.gemspec
 - test/rails_test/.gitignore
@@ -2360,8 +2360,6 @@ files:
 - test/rails_test/spec/models/profile_spec.rb
 - test/rails_test/spec/models/user_spec.rb
 - test/rails_test/spec/spec_helper.rb
-- test/rails_test/test/performance/browsing_test.rb
-- test/rails_test/test/test_helper.rb
 - test/rails_test/vendor/plugins/.gitkeep
 - test/rails_test/vendor/plugins/geokit-rails/CHANGELOG.rdoc
 - test/rails_test/vendor/plugins/geokit-rails/MIT-LICENSE
@@ -2406,7 +2404,7 @@ files:
 - test/rails_test/vendor/plugins/geokit-rails/test/tasks.rake
 - test/rails_test/vendor/plugins/geokit-rails/test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/tatemae/muck_profiles
+homepage: http://github.com/tatemae/muck-profiles
 licenses: []
 
 post_install_message: 
@@ -2504,8 +2502,6 @@ test_files:
 - test/rails_test/spec/models/profile_spec.rb
 - test/rails_test/spec/models/user_spec.rb
 - test/rails_test/spec/spec_helper.rb
-- test/rails_test/test/performance/browsing_test.rb
-- test/rails_test/test/test_helper.rb
 - test/rails_test/vendor/plugins/geokit-rails/init.rb
 - test/rails_test/vendor/plugins/geokit-rails/install.rb
 - test/rails_test/vendor/plugins/geokit-rails/lib/geokit-rails/acts_as_mappable.rb

data/lib/muck_profiles.rb

@@ -1,7 +0,0 @@
-require 'muck_engine'
-require 'muck_contents'
-
-require 'muck_profiles/config'
-require 'muck_profiles/models/profile'
-require 'muck_profiles/models/user'
-require 'muck_profiles/engine'

data/test/rails_test/test/performance/browsing_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-require 'rails/performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionDispatch::PerformanceTest
-  def test_homepage
-    get '/'
-  end
-end

data/test/rails_test/test/test_helper.rb

@@ -1,13 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-
-class ActiveSupport::TestCase
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
-
-  # Add more helper methods to be used by all tests here...
-end