muck-profiles 0.1.13 → 0.1.14

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/app/controllers/muck/profiles_controller.rb

@@ -1,7 +1,10 @@
 class Muck::ProfilesController < ApplicationController
   unloadable
 
+  before_filter :setup_user, :only => [:show, :edit]
+  
   def index
+    @users = User.by_newest.paginate(:page => @page, :per_page => @per_page, :include => 'profile')
     respond_to do |format|
       format.html { render :template => 'profiles/index' }
     end
@@ -9,7 +12,6 @@ class Muck::ProfilesController < ApplicationController
 
   # show a given user's public profile information
   def show
-    @user = User.find(params[:id])
     @profile = @user.profile
     @page_title = @user.display_name
     respond_to do |format|
@@ -17,10 +19,20 @@ class Muck::ProfilesController < ApplicationController
     end
   end
 
+  # Renders an edit for for the current user's profile
+  #
+  # It is simple to override the edit template.  Simply create a template in app/views/profiles/edit.html.erb 
+  # and add something similar to the following:
+  #    <div id="edit_profile">
+  #      <%= output_errors(t('muck.profiles.problem_editing_profile'), {:class => 'help-box'}, @profile) %>
+  #      <% profile_form(@profile) do |f| -%>
+  #        <%# Add custom fields here.  ie %>
+  #        <%= f.text_field :custom_thing %>
+  #      <% end -%>
+  #    </div>
   def edit
-    @page_title = t('muck.profiles.edit_profile')
-    @user = User.find(params[:user_id])
     @profile = @user.profile
+    @page_title = t('muck.profiles.edit_profile_title', :name => @user.display_name)
     respond_to do |format|
       format.pjs do
         render_as_html do
@@ -32,9 +44,9 @@ class Muck::ProfilesController < ApplicationController
   end
   
   def update
-    @page_title = t('muck.profiles.edit_profile')
     @user = User.find(params[:user_id])
     @profile = @user.profile
+    @page_title = t('muck.profiles.edit_profile_title', :name => @user.display_name)
     @profile.update_attributes!(params[:profile])
     respond_to do |format|
       flash[:notice] = t('muck.profiles.edit_success')
@@ -45,4 +57,11 @@ class Muck::ProfilesController < ApplicationController
     render :action => :edit
   end
 
+  protected
+    def setup_user
+      if params[:user_id]
+        @user = User.find(params[:user_id]) rescue nil
+      end
+      @user ||= User.find(params[:id])
+    end
 end

data/app/helpers/muck_profiles_helper.rb

@@ -1,3 +1,12 @@
 module MuckProfilesHelper
 
+  # Renders a profile edit form
+  # content:  Optional content object to be edited.
+  # options:  html options for form.  For example:
+  #             :html => {:id => 'a form'}
+  def profile_form(profile, options = {}, &block)
+    options[:html] = {} if options[:html].nil?
+    raw_block_to_partial('profiles/form', options.merge(:profile => profile), &block)
+  end
+  
 end

data/app/views/profiles/_form.html.erb

@@ -0,0 +1,12 @@
+<div id="<%= "#{profile.dom_id}" %>" class="edit_profile">
+  <% custom_form_for(profile, :url => user_profile_path(profile.user), :html => html.merge(:id => "edit-profile-form", :name => 'edit-profile-form', :method => :put, :multipart => true ) ) do |f| -%>
+    <div id="edit_profile_image">
+      <%= image_tag profile.photo.url(:thumb) %>
+      <%= f.file_field :photo, { :label => t('muck.profiles.upload_photo') } %>
+    </div>
+    <%= capture(f, &block) %>
+    <div id="edit_profile_submit" class="button form-row">
+      <%= f.submit t('muck.general.update') %>
+    </div>
+  <% end %>
+</div>

data/app/views/profiles/_profile.html.erb

@@ -0,0 +1,4 @@
+<div class="user-profile-small">
+  <%= icon user, :tiny %>
+  <%= link_to user.display_name, profile_path(user) %>
+</div>

data/app/views/profiles/edit.html.erb

@@ -0,0 +1,6 @@
+<div id="edit_content" class="span-24 colborder column">
+  <%= output_errors(t('muck.profiles.problem_editing_profile'), {:class => 'help-box'}, @profile) %>
+  <% profile_form(@profile) do |f| -%>
+    <%# can add form fields as desired here -%>
+  <% end -%>
+</div>

data/app/views/profiles/index.html.erb

@@ -0,0 +1 @@
+<%= render :partial => 'profiles/profile', :collection => @users, :as => :user %>

data/app/views/profiles/show.html.erb

@@ -2,4 +2,4 @@
   <%= icon @user, :thumb %>
   <p><%= @user.full_name %></p>
   <p><%= link_to t('muck.profiles.edit_profile'), edit_user_profile_path(@user) if @profile.can_edit?(current_user) %></p>
-</div>
+</div>

data/lib/active_record/acts/muck_profile.rb

@@ -17,8 +17,8 @@ module ActiveRecord
                                          :icon => "50x50>",
                                          :tiny => "24x24>" },
                             :default_url => "/images/profile_default.jpg"
-          
-                            
+
+
           class_eval <<-EOV
             attr_protected :created_at, :updated_at, :photo_file_name, :photo_content_type, :photo_file_size
           EOV
@@ -36,12 +36,6 @@ module ActiveRecord
 
       # All the methods available to a record that has had <tt>acts_as_muck_profile</tt> specified.
       module InstanceMethods
-
-        # def query_services
-        #   uri = read_attribute(:blog)
-        #   rss_link = RssMethods::auto_detect_rss_url(uri)
-        #   write_attribute(:blog_rss, rss_link) if rss_link
-        # end
         
         def can_edit?(user)
           return false if user.nil?

data/locales/en.yml

@@ -2,8 +2,9 @@ en:
   muck:
     profiles:
       upload_photo: "Upload a photo:"
-      problem_editing_account: "There was a problem updating your profile"
+      problem_editing_profile: "There was a problem updating your profile"
       edit_profile: "Edit Profile"
+      edit_profile_title: "Editing profile for {{name}}"
       view_profile: "View Profile"
       update_profile: "Update Profile"
       edit_success: "Successfully updated your profile"

data/muck-profiles.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-profiles}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2009-10-29}
   s.description = %q{Profile engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,8 @@ Gem::Specification.new do |s|
      "app/controllers/muck/profiles_controller.rb",
      "app/helpers/muck_profiles_helper.rb",
      "app/views/admin/profiles/edit.html.erb",
+     "app/views/profiles/_form.html.erb",
+     "app/views/profiles/_profile.html.erb",
      "app/views/profiles/edit.html.erb",
      "app/views/profiles/index.html.erb",
      "app/views/profiles/show.html.erb",
@@ -90,6 +92,8 @@ Gem::Specification.new do |s|
      "test/rails_root/Rakefile",
      "test/rails_root/app/controllers/application_controller.rb",
      "test/rails_root/app/controllers/default_controller.rb",
+     "test/rails_root/app/controllers/profiles_controller.rb",
+     "test/rails_root/app/controllers/users_controller.rb",
      "test/rails_root/app/helpers/application_helper.rb",
      "test/rails_root/app/models/.keep",
      "test/rails_root/app/models/profile.rb",
@@ -297,6 +301,8 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/rails_root/app/controllers/application_controller.rb",
      "test/rails_root/app/controllers/default_controller.rb",
+     "test/rails_root/app/controllers/profiles_controller.rb",
+     "test/rails_root/app/controllers/users_controller.rb",
      "test/rails_root/app/helpers/application_helper.rb",
      "test/rails_root/app/models/profile.rb",
      "test/rails_root/app/models/user.rb",

data/test/rails_root/app/controllers/application_controller.rb

@@ -5,10 +5,17 @@ class ApplicationController < ActionController::Base
 
   protected
 
+    # **********************************************
+    # SSL method
+    # only require ssl if we are in production
+    def ssl_required?
+      return false
+    end
+    
     # called by Admin::Muck::BaseController to check whether or not the
     # user should have access to the admin UI
-    def admin_access?
-      admin?
+    def admin_access_required
+      access_denied unless admin?
     end
-  
+    
 end

data/test/rails_root/app/controllers/profiles_controller.rb

@@ -0,0 +1,3 @@
+class ProfilesController < Muck::ProfilesController
+  
+end

data/test/rails_root/app/controllers/users_controller.rb

@@ -0,0 +1,3 @@
+class UsersController < Muck::UsersController
+
+end

data/test/rails_root/config/environment.rb

@@ -1,4 +1,4 @@
-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 
 require File.join(File.dirname(__FILE__), 'boot')
 
@@ -16,7 +16,8 @@ end
 Rails::Initializer.run do |config|
   config.time_zone = 'UTC'
   config.gem "authlogic"
-  config.gem "binarylogic-searchlogic", :lib => 'searchlogic', :source  => 'http://gems.github.com', :version => '~> 2.0.0'
+  config.gem "searchlogic"
+  config.gem 'mislav-will_paginate', :lib => 'will_paginate', :source => 'http://gems.github.com'
   config.gem "bcrypt-ruby", :lib => "bcrypt"
   config.gem 'thoughtbot-paperclip', :lib => 'paperclip', :source => "http://gems.github.com"
   config.gem 'muck-engine', :lib => 'muck_engine'

data/test/rails_root/config/routes.rb

@@ -2,6 +2,9 @@ ActionController::Routing::Routes.draw do |map|
   
   map.root :controller => 'default', :action => 'index'
   
+  map.resources :profiles
+  map.resources :users, :has_one => :profile
+    
   # Install the default routes as the lowest priority.
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action/:id.:format'

data/test/rails_root/test/functional/admin/profiles_controller_test.rb

@@ -5,10 +5,19 @@ class Admin::Muck::ProfilesControllerTest < ActionController::TestCase
   tests Admin::Muck::ProfilesController
 
   should_require_login :edit => :get, :login_url => '/login'
-  should_require_role(:admin, '/login', :index)
   
+  context "logged in as normal user" do
+    setup do
+      @user = Factory(:user)
+      activate_authlogic
+      login_as @user
+    end
+
+    should_require_role(:admin, '/login', :edit)
+  end
+
   context "logged in as admin" do
-    
+
     setup do
       @admin = Factory(:user)
       @admin_role = Factory(:role, :rolename => 'administrator')
@@ -16,7 +25,7 @@ class Admin::Muck::ProfilesControllerTest < ActionController::TestCase
       activate_authlogic
       login_as @admin
     end
-    
+
     context "GET edit" do
       setup do
         get :edit

data/test/rails_root/test/functional/profiles_controller_test.rb

@@ -13,4 +13,13 @@ class Muck::ProfilesControllerTest < ActionController::TestCase
     should_render_template :show
   end
 
+  context "GET edit" do
+    setup do
+      @user = Factory(:user)
+      get :edit, :user_id => @user.to_param
+    end
+    should_respond_with :success
+    should_render_template :edit
+  end
+  
 end

data/test/rails_root/test/shoulda_macros/controller.rb

@@ -5,7 +5,11 @@ module MuckControllerMacros
     login_url = args.delete :login_url
     args.each do |action, verb|
       should "Require login for '#{action}' action" do
-        send(verb, action)
+        if [:put, :delete].include?(verb) # put and delete require an id even if it is a bogus one
+          send(verb, action, :id => 1)
+        else
+          send(verb, action)
+        end
         assert_redirected_to(login_url)
       end
     end

data/test/rails_root/test/unit/profile_test.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ProfileTest < ActiveSupport::TestCase
+
+  context 'A profile' do
+    setup do
+      @user = Factory(:user)
+      @profile = @user.profile
+    end
+    subject { @profile }
+    
+    should_belong_to :user
+    
+  end
+
+end

data/test/rails_root/test/unit/user_test.rb

@@ -6,6 +6,8 @@ class UserTest < ActiveSupport::TestCase
     setup do
       @user = Factory(:user)
     end
+    subject { @user }
+    
     should_accept_nested_attributes_for :profile
     should_have_one :profile
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-profiles
 version: !ruby/object:Gem::Version 
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -06:00
+date: 2009-10-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,8 @@ files:
 - app/controllers/muck/profiles_controller.rb
 - app/helpers/muck_profiles_helper.rb
 - app/views/admin/profiles/edit.html.erb
+- app/views/profiles/_form.html.erb
+- app/views/profiles/_profile.html.erb
 - app/views/profiles/edit.html.erb
 - app/views/profiles/index.html.erb
 - app/views/profiles/show.html.erb
@@ -115,6 +117,8 @@ files:
 - test/rails_root/Rakefile
 - test/rails_root/app/controllers/application_controller.rb
 - test/rails_root/app/controllers/default_controller.rb
+- test/rails_root/app/controllers/profiles_controller.rb
+- test/rails_root/app/controllers/users_controller.rb
 - test/rails_root/app/helpers/application_helper.rb
 - test/rails_root/app/models/.keep
 - test/rails_root/app/models/profile.rb
@@ -343,6 +347,8 @@ summary: Profile engine for the muck system
 test_files: 
 - test/rails_root/app/controllers/application_controller.rb
 - test/rails_root/app/controllers/default_controller.rb
+- test/rails_root/app/controllers/profiles_controller.rb
+- test/rails_root/app/controllers/users_controller.rb
 - test/rails_root/app/helpers/application_helper.rb
 - test/rails_root/app/models/profile.rb
 - test/rails_root/app/models/user.rb