muck-engine 0.2.26 → 0.2.27

data/public/javascripts/jquery/jquery.tips.js

@@ -12,6 +12,11 @@ jQuery(document).ready(function() {
 		var tip_text = field.siblings('.tip-text').html();
 		var tip_title = field.siblings('.tip-title').html();
 		var tip_position = field.siblings('.tip-position').html();
+		if(tip_text == null){
+			tip_text = field.parent().siblings('.tip-text').html();
+			tip_title = field.parent().siblings('.tip-title').html();
+			tip_position = field.parent().siblings('.tip-position').html();
+		}
 		if (!tip_position) { tip_position = 'right'; }
 		show_tip(control_id, tip_title, tip_text, tip_position);
 		jQuery("#" + help_id + "-container").addClass("active");

data/test/rails_root/app/models/user.rb

@@ -0,0 +1,4 @@
+class User < ActiveRecord::Base
+  acts_as_authentic
+  acts_as_muck_user
+end

data/test/rails_root/app/models/user_session.rb

@@ -0,0 +1,2 @@
+class UserSession < Authlogic::Session::Base
+end

data/test/rails_root/config/environment.rb

@@ -1,4 +1,4 @@
-RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 require File.join(File.dirname(__FILE__), 'boot')
 
@@ -16,5 +16,7 @@ end
 Rails::Initializer.run do |config|
   config.time_zone = 'UTC'
   config.gem "will_paginate"
+  config.gem 'overlord'
+  config.gem 'muck-users', :lib => 'muck_users'
   config.plugin_locators << TestGemLocator
 end

data/test/rails_root/public/javascripts/jquery/jquery.tips.js

@@ -12,6 +12,11 @@ jQuery(document).ready(function() {
 		var tip_text = field.siblings('.tip-text').html();
 		var tip_title = field.siblings('.tip-title').html();
 		var tip_position = field.siblings('.tip-position').html();
+		if(tip_text == null){
+			tip_text = field.parent().siblings('.tip-text').html();
+			tip_title = field.parent().siblings('.tip-title').html();
+			tip_position = field.parent().siblings('.tip-position').html();
+		}
 		if (!tip_position) { tip_position = 'right'; }
 		show_tip(control_id, tip_title, tip_text, tip_position);
 		jQuery("#" + help_id + "-container").addClass("active");

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

@@ -6,6 +6,8 @@ class Admin::Muck::DefaultControllerTest < ActionController::TestCase
 
   context "GET to admin index" do
     setup do
+      @user = stub(:display_name => 'test')
+      @controller.stubs(:current_user).returns(@user)
       @controller.stubs(:login_required).returns(true)
       @controller.stubs(:admin_access_required).returns(true)
       get :index
@@ -24,4 +26,4 @@ class Admin::Muck::DefaultControllerTest < ActionController::TestCase
   #   should_respond_with :redirect
   # end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-engine
 version: !ruby/object:Gem::Version 
-  version: 0.2.26
+  version: 0.2.27
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -07:00
+date: 2010-01-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: The base engine for the muck system.  Contains common tables, custom for, css and javascript.
 email: justin@tatemae.com
 executables: []
@@ -101,6 +111,7 @@ files:
 - db/migrate/20090426041103_create_states.rb
 - install.rb
 - lib/action_controller/muck_application.rb
+- lib/action_mailer/muck_mailer.rb
 - lib/active_record/muck_model.rb
 - lib/muck_engine.rb
 - lib/muck_engine/initialize_routes.rb
@@ -746,6 +757,8 @@ files:
 - test/rails_root/app/controllers/default_controller.rb
 - test/rails_root/app/helpers/application_helper.rb
 - test/rails_root/app/models/.keep
+- test/rails_root/app/models/user.rb
+- test/rails_root/app/models/user_session.rb
 - test/rails_root/app/views/admin/default/index.html.erb
 - test/rails_root/app/views/default/index.html.erb
 - test/rails_root/app/views/layouts/default.html.erb
@@ -1365,6 +1378,8 @@ test_files:
 - test/rails_root/app/controllers/application_controller.rb
 - test/rails_root/app/controllers/default_controller.rb
 - test/rails_root/app/helpers/application_helper.rb
+- test/rails_root/app/models/user.rb
+- test/rails_root/app/models/user_session.rb
 - test/rails_root/config/boot.rb
 - test/rails_root/config/environment.rb
 - test/rails_root/config/environments/development.rb