muck-engine 0.4.34 → 3.0.3

data/README.rdoc

@@ -10,15 +10,9 @@ Add optional functionality with the following command:
 
 == Installation
 
-  sudo gem install mislav-will_paginate -s 'http://gems.github.com'
-  
   sudo gem install muck-engine
 
 == Setup
-Be sure to include the muck_engine tasks in your Rakefile:
-
-  require 'muck_engine'
-  require 'muck_engine/tasks'
 
 Add a method to application_controller.rb that will determine which users have access to the admin section of the website
 
@@ -106,64 +100,6 @@ If you wish to enable jgrowl then add the following lines to application.js and
   	jQuery.jGrowl(msg, {sticky:true});
   }
 
-== Rake tasks
-The muck engine comes with an abundance of rake tasks mostly meant for development of muck engines.  If you want to use these tasks
-be sure that you first do a sudo install muck-engine.  Next define the muck gems you are using in a file RAILS_ROOT/lib/tasks/muck.rake.
-Here's an example taken from the muck project:
-
-  require 'rake'
-  begin
-    require 'git'
-  rescue LoadError
-    puts "git gem not installed.  If git functionality is required run 'sudo gem install git'"
-  end
-  require 'fileutils'
-
-  namespace :muck do
-  
-    def muck_gems
-      ['cms-lite', 'disguise', 'uploader', 'muck-solr', 'muck-raker', 'muck-engine',
-      'muck-users', 'muck-activities', 'muck-comments', 'muck-profiles', 'muck-friends',
-      'muck-contents', 'muck-blogs', 'muck-shares'] #'muck-invites'
-    end
-  
-    desc 'Translate muck and all themes from English into all languages supported by Google'
-    task :translate => :environment do
-      puts 'translating muck'
-      system("babelphish -o -y #{RAILS_ROOT}/config/locales/en.yml")
-      theme_path = File.join(RAILS_ROOT, 'themes')
-      Dir.glob("#{theme_path}/*").each do |next_file|
-        if File.directory?(next_file)
-          file = File.join(next_file, 'locales', 'en.yml')
-          system("babelphish -o -y #{file}")
-        end
-      end
-    end
-
-    desc "Translate all muck related projects and gems"
-    task :translate_all do
-      Rake::Task[ "muck:translate" ].execute
-      Rake::Task[ "muck:translate_gems" ].execute
-      puts 'finished translations'
-    end
-  
-    desc "Gets everything ready for a release. Translates muck + gems, release gems, commits gems translates muck, writes versions into muck and then commits muck.  This takes a while"
-    task :prepare_release do
-      # Rake::Task[ "muck:commit_gems" ].execute
-      # Rake::Task[ "muck:pull_gems" ].execute
-      Rake::Task[ "muck:translate_all" ].execute
-      Rake::Task[ "muck:release_gems" ].execute
-      Rake::Task[ "muck:commit_gems" ].execute
-      Rake::Task[ "muck:push_gems" ].execute
-      Rake::Task[ "muck:versions" ].execute
-      # Commit and push muck
-      git_commit("#{projects_path}/muck", "Updated gem versions")
-      git_pull("#{projects_path}/muck")
-      git_push("#{projects_path}/muck")
-      puts "Don't forget to install the new gems on the server"
-    end
-
-  end
   
 == Development Notes
 es-CO.yml is missing a space on line 91:
@@ -174,4 +110,4 @@ should be:
   record_invalid: "Falla de validación: {{errors}}"
 
 
-Copyright (c) 2009 Tatemai, released under the MIT license
+Copyright (c) 2009-2010 Tatemai, released under the MIT license

data/Rakefile

@@ -1,15 +1,20 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'rspec/core/rake_task'
 
-desc 'Default: run unit tests.'
-task :default => :test
+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
 
-desc 'Test the muck_users gem.'
-Rake::TestTask.new(:test) do |t|
+desc 'Test the muck-users gem.'
+Rake::TestTask.new(:spec) do |t|
   t.libs << 'lib'
-  t.libs << 'test/rails_root/test'
-  t.pattern = 'test/rails_root/test/**/*_test.rb'
+  t.libs << 'test/rails_root/spec'
+  t.pattern = 'test/rails_root/spec/**/*_spec.rb'
   t.verbose = true
 end
 
@@ -29,7 +34,7 @@ rescue LoadError
   end
 end
 
-desc 'Generate documentation for the muck_engine plugin.'
+desc 'Generate documentation for the muck-engine plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'MuckEngine'
@@ -40,7 +45,7 @@ end
 
 desc 'Translate this gem'
 task :translate do
-  file = File.join(File.dirname(__FILE__), 'locales', 'en.yml')
+  file = File.join(File.dirname(__FILE__), 'config', 'locales', 'en.yml')
   system("babelphish -o -y #{file}")
 end
 
@@ -50,14 +55,27 @@ begin
     gemspec.name = "muck-engine"
     gemspec.summary = "The base engine for the muck system."
     gemspec.email = "justin@tatemae.com"
-    gemspec.homepage = "http://github.com/tatemae/muck_engine"
+    gemspec.homepage = "http://github.com/tatemae/muck-engine"
     gemspec.description = "The base engine for the muck system.  Contains common tables, custom for, css and javascript."
     gemspec.authors = ["Justin Ball", "Joel Duffin"]
     gemspec.rubyforge_project = 'muck-engine'
-    gemspec.add_dependency "validation_reflection", "0.3.8"
-    gemspec.add_dependency "will_paginate"
-    gemspec.add_dependency "overlord", "0.1.22"
+    gemspec.add_dependency "validation_reflection"
+    gemspec.add_dependency "will_paginate", '~> 3.0.beta'
+    gemspec.add_dependency "overlord"
+    gemspec.add_development_dependency "shoulda"
+    gemspec.add_development_dependency "rspec-rails", ">=2.0.0"
+    gemspec.add_development_dependency "cucumber-rails"
+    gemspec.add_development_dependency "autotest"
+    gemspec.add_development_dependency "capybara", ">= 0.3.9"
     gemspec.add_development_dependency "shoulda"
+    gemspec.add_development_dependency "factory_girl"
+    gemspec.add_development_dependency "cucumber"
+    gemspec.add_development_dependency "rcov"
+    gemspec.add_development_dependency "rspec", ">=2.0.0"
+    gemspec.add_development_dependency "database_cleaner"
+    gemspec.add_development_dependency "spork"
+    gemspec.add_development_dependency "launchy"
+    gemspec.add_development_dependency "muck-users"
     gemspec.add_development_dependency "git"
   end
   Jeweler::RubyforgeTasks.new do |rubyforge|

data/VERSION

@@ -1 +1 @@
-0.4.34
+3.0.3

data/app/helpers/muck_engine_helper.rb

@@ -14,12 +14,12 @@ module MuckEngineHelper
   #
   # message_dom_id: The dom id of the element that will hold messages.
   #                 This element can have display:none by default.
-  def jquery_json_message(message_dom_id)
-    if GlobalConfig.growl_enabled
-      "jQuery('##{message_dom_id}').html(json.message);"
-      "jQuery('##{message_dom_id}').show();"
-    else
+  def jquery_json_message(message_dom_id = nil)
+    if MuckEngine.configuration.growl_enabled
       "jQuery.jGrowl.info(json.message);"
+    else
+      "jQuery('##{message_dom_id}').html(json.message);" +
+      "jQuery('##{message_dom_id}').show();"
     end
   end
   
@@ -30,26 +30,16 @@ module MuckEngineHelper
     render :partial => 'scripts/country_scripts'
   end
   
-  def custom_form_for(record_or_name_or_array, *args, &proc) 
+  def muck_form_for(record_or_name_or_array, *args, &proc) 
     options = args.detect { |argument| argument.is_a?(Hash) } 
     if options.nil? 
-      options = {:builder => MuckCustomFormBuilder} 
+      options = {:builder => MuckEngine::FormBuilder} 
       args << options 
     end 
-    options[:builder] = MuckCustomFormBuilder unless options.nil? 
+    options[:builder] = MuckEngine::FormBuilder unless options.nil? 
     form_for(record_or_name_or_array, *args, &proc) 
   end
-  
-  def custom_remote_form_for(record_or_name_or_array, *args, &proc) 
-    options = args.detect { |argument| argument.is_a?(Hash) } 
-    if options.nil? 
-      options = {:builder => MuckCustomFormBuilder} 
-      args << options 
-    end 
-    options[:builder] = MuckCustomFormBuilder unless options.nil? 
-    remote_form_for(record_or_name_or_array, *args, &proc) 
-  end
-  
+    
   # generates javascript that will hide a link or button
   # when click and then show a different dom object
   def show_hide_on_click(id_to_show, id_to_hide)
@@ -139,39 +129,31 @@ module MuckEngineHelper
   # Used inside of format.js to return a message to the client.
   # If jGrowl is enabled the message will show up as a growl instead of a popup
   def page_alert(message, title = '')
-    if GlobalConfig.growl_enabled
+    if MuckEngine.configuration.growl_enabled
       "jQuery.jGrowl.error('" + message + "', {header:'" + title + "'});"
     else
       "alert(#{message});"
     end
   end
   
-  # Override link_to_remote so that instead of '#' the proper url is rendered
-  # This makes the link usable even if javascript is disabled
-  # See: http://www.intridea.com/2007/11/21/link_to_remote-unobtrusively
-  def link_to_remote(name, options = {}, html_options = {})  
-    html_options.merge!({:href => url_for(options[:url])}) unless options[:url].blank?
-    super(name, options, html_options)  
-  end
-  
   def locale_link(name, locale)
     parts = request.host.split('.')
     first_subdomain = parts.first
-    request_uri = request.request_uri
+    fullpath = request.fullpath
     if first_subdomain == 'www' or Language.supported_locale?(first_subdomain)
-      link_to name, request.protocol + (locale == I18n.default_locale.to_s ? 'www' : locale) + '.' + parts[1..-1].join('.') + request.port_string + request_uri
+      link_to name, request.protocol + (locale == I18n.default_locale.to_s ? 'www' : locale) + '.' + parts[1..-1].join('.') + request.port_string + fullpath
     elsif /^localhost/.match( request.host ) or /^(\d{1,3}\.){3}\d{1,3}$/.match( request.host )
-      if request_uri.include?('?')
-        if request_uri.include?('locale')
-          link_to name, request.protocol + request.host_with_port + request_uri.sub(/locale=.*/, 'locale=' + locale)
+      if fullpath.include?('?')
+        if fullpath.include?('locale')
+          link_to name, request.protocol + request.host_with_port + fullpath.sub(/locale=.*/, 'locale=' + locale)
         else
-          link_to name, request.protocol + request.host_with_port + request_uri + '&locale=' + locale
+          link_to name, request.protocol + request.host_with_port + fullpath + '&locale=' + locale
         end
       else
-        link_to name, request.protocol + request.host_with_port + request_uri + '?locale=' + locale
+        link_to name, request.protocol + request.host_with_port + fullpath + '?locale=' + locale
       end  
     else
-      link_to name, request.protocol + (locale == I18n.default_locale.to_s ? 'www' : locale) + '.' + request.host_with_port + request_uri
+      link_to name, request.protocol + (locale == I18n.default_locale.to_s ? 'www' : locale) + '.' + request.host_with_port + fullpath
     end
   end
 
@@ -193,7 +175,7 @@ module MuckEngineHelper
   # from http://snippets.dzone.com/posts/show/2483
   def block_to_partial(partial_name, options = {}, &block)
     options.merge!(:body => capture(&block))
-    concat(render(:partial => partial_name, :locals => options))
+    render(:partial => partial_name, :locals => options)
   end
     
   # Take a block and renders that block within the context of a partial.
@@ -202,7 +184,7 @@ module MuckEngineHelper
   # from http://snippets.dzone.com/posts/show/2483
   def raw_block_to_partial(partial_name, options = {}, &block)
     options.merge!(:block => block)
-    concat(render(:partial => partial_name, :locals => options))
+    render(:partial => partial_name, :locals => options)
   end
   
   # Summarize html content by removing html

data/app/mailers/basic_mailer.rb

@@ -0,0 +1,9 @@
+class BasicMailer < ActionMailer::Base
+
+  def mail_from_params(options)
+    options[:to] ||= MuckEngine.configuration.support_email
+    options[:from] ||= self.class.default_from_email
+    mail(options)
+  end
+
+end

data/app/views/admin/default/index.html.erb

@@ -1,4 +1,4 @@
-<% MuckEngine.muck_dashboard_items.each do |item| -%>
+<% MuckEngine.configuration.muck_dashboard_items.each do |item| -%>
   <div class="dashboard-widget span-6">
     <%= render :partial => item.path, :locals => item.locals -%>
   </div>

data/app/views/forms/_base_field.erb

@@ -1,13 +1,13 @@
-<%= pre_html %>
+<%= (pre_html || '').html_safe %>
 <% if is_checkbox -%>
 	<%= field_element %>
-	<%= label_element %>
-	<%= after_label_html %>
+	<%= label_element.html_safe %>
+	<%= (after_label_html || '').html_safe %>
 <% else -%>
-	<%= label_element %>
-	<%= after_label_html %>
+	<%= label_element.html_safe %>
+	<%= (after_label_html  || '').html_safe %>
 	<%= field_element %>
 <% end -%>
 <% if required -%><div id="<%= field_name %>_required" class="required-tip" style="display:none;"><em><%= I18n.t('muck.forms.please_enter_a_value', :label => label_name) %></em></div><% end -%>
 <% if !hide_control_error && defined? error -%><div class="form_error_message"><%= error %></div><% end -%>
-<%= extra_html %>
+<%= (extra_html || '').html_safe %>

data/app/views/forms/_tips.erb

@@ -1,6 +1,6 @@
-<div class="tip-text" style="display:none;"><%= tip %></div>
-<div class="tip-title" style="display:none;"><%= tip_title || label_name %></div>
-<div class="tip-position" style="display:none;"><%= tip_position %></div>
+<div class="tip-text" style="display:none;"><%= (tip || '').html_safe %></div>
+<div class="tip-title" style="display:none;"><%= (tip_title || label_name || '').html_safe %></div>
+<div class="tip-position" style="display:none;"><%= (tip_position || '').html_safe %></div>
 <% if tip_key -%>
   <div class="tip-key" style="display:none;"><%= tip_key %></div>
   <div class="tip-id" style="display:none;"><%= field_name %></div>

data/app/views/layouts/admin/_head.html.erb

@@ -1,12 +1,12 @@
-<title><%= @page_title || GlobalConfig.application_name %></title>
+<title><%= @page_title || MuckEngine.configuration.application_name %></title>
 <meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
-<%= google_load_jquery_ui_css(http_protocol) %>
+<%= google_load_jquery_ui_css(http_protocol, 'smoothness', '1.8.4') %>
 <%= stylesheet_link_tag 'blueprint/print.css', :media => "print" %>
 <!--[if IE]><link rel="stylesheet" href="/stylesheets/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
 <%= stylesheet_link_tag %W{ reset styles blueprint/liquid_screen jquery/jquery.autocomplete jquery/jquery.fancybox fgmenu/fg.menu.css admin }, :cache => 'admin_styles' %>
-<%= stylesheet_link_tag MuckEngine.muck_admin_css -%>
-<%= google_load_jquery(http_protocol) %>
-<%= google_load_jquery_ui(http_protocol) %>
+<%= stylesheet_link_tag MuckEngine.configuration.muck_admin_css -%>
+<%= google_load_jquery(http_protocol, '1.4.2') %>
+<%= google_load_jquery_ui(http_protocol, '1.8.4') %>
 <%= javascript_include_tag %w{
   jquery/jquery.form.js
   jquery/jquery.jgrowl.js

data/app/views/layouts/admin/_header.html.erb

@@ -10,7 +10,7 @@
 </div>
 <div id="main-navigation" class="navigation">
   <ul id="admin-nav">
-    <%= render :partial => 'layouts/admin/header_nav_item', :collection => MuckEngine.muck_admin_nav_items %>
+    <%= render :partial => 'layouts/admin/header_nav_item', :collection => MuckEngine.configuration.muck_admin_nav_items %>
   </ul>
 </div>
 <div id="sub-header" class="span-24">

data/app/views/layouts/{email_default.text.html.erb → email_default.html.erb}

@@ -8,14 +8,14 @@
     
     <p>Thanks very much,<br />
 
-    The <%=GlobalConfig.application_name%> Team</p>
+    The <%=MuckEngine.configuration.application_name%> Team</p>
     
     <hr />
-    <p>Please add <%=GlobalConfig.support_email%> to your email address book and “safe domain” lists.</p>
+    <p>Please add <%=MuckEngine.configuration.support_email%> to your email address book and “safe domain” lists.</p>
     
     <p>
       We respect your privacy; please view our privacy policy here:
-      <a href="http://<%=GlobalConfig.application_url%>/privacy"><%=GlobalConfig.application_url%>/privacy</a>
+      <a href="http://<%=MuckEngine.configuration.application_url%>/privacy"><%=MuckEngine.configuration.application_url%>/privacy</a>
     </p>
   </body>
 </html>

data/app/views/layouts/email_default.text.erb

@@ -0,0 +1,13 @@
+<%= yield  %>
+
+Thanks very much,
+
+The <%=MuckEngine.configuration.application_name%> Team
+
+_______________________________________________________________________
+
+
+Please add <%=MuckEngine.configuration.support_email%> to your email address book and “safe domain” lists.
+
+We respect your privacy; please view our privacy policy here:
+http://<%=MuckEngine.configuration.application_url%>/privacy

data/app/views/layouts/global/_google_analytics.html.erb

@@ -4,9 +4,9 @@
 </script>
 <script type="text/javascript">
   try {
-    var pageTracker = _gat._getTracker("<%= GlobalConfig.google_tracking_code %>");
-    <% if GlobalConfig.google_tracking_set_domain -%>
-    pageTracker._setDomainName("<%= GlobalConfig.google_tracking_set_domain %>");
+    var pageTracker = _gat._getTracker("<%= MuckEngine.configuration.google_tracking_code %>");
+    <% if MuckEngine.configuration.google_tracking_set_domain -%>
+    pageTracker._setDomainName("<%= MuckEngine.configuration.google_tracking_set_domain %>");
     <% end -%>
     pageTracker._trackPageview();
   } catch(err) {}</script>

data/app/views/layouts/global/_head.html.erb

@@ -1,4 +1,4 @@
-<title><%= @page_title || GlobalConfig.application_name %></title>
+<title><%= @page_title || MuckEngine.configuration.application_name %></title>
 <meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="distribution" content="all" />
@@ -7,14 +7,14 @@
 <meta name="MSSmartTagsPreventParsing" content="true" />
 <%= stylesheet_link_tag 'blueprint/print.css', :media => "print" %>
 <!--[if IE]><link rel="stylesheet" href="/stylesheets/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-<% if GlobalConfig.local_jquery -%>
-  <link rel="stylesheet" href="/stylesheets/jquery/ui-lightness/jquery-ui-1.8.4.custom.css" type="text/css" />
+<% if MuckEngine.configuration.local_jquery -%>
+  <link rel="stylesheet" href="/stylesheets/jquery/smoothness/jquery-ui-1.8.4.custom.css" type="text/css" />
   <script src="/javascripts/jquery/jquery.js" type="text/javascript"></script>
   <script src="/javascripts/jquery/jquery-ui-1.8.4.custom.min.js" type="text/javascript"></script>
 <% else -%>
-  <%= google_load_jquery_ui_css(http_protocol, '1.8.4') %>
+  <%= google_load_jquery_ui_css(http_protocol, 'smoothness', '1.8.4') %>
   <%= google_load_jquery(http_protocol, '1.4.2') %>
-  <%= google_load_jquery_ui(http_protocol, 'smoothness', '1.8.4') %>
+  <%= google_load_jquery_ui(http_protocol, '1.8.4') %>
 <% end -%>
 <%= stylesheet_link_tag %W{ reset styles blueprint/screen.css default }, :cache => true %>
 <%= javascript_include_tag %w{

data/app/views/shared/_delete.erb

@@ -1,7 +1,7 @@
 <% if button_type == :text -%>
   <%= link_to( button_text, :url => delete_path, :method => :delete, :html => { :class  => 'muck_ajax_delete_control ajax-delete' }) %>
 <% else -%>
-  <% form_for(delete_object, :url => delete_path, :html => { :class => "ajax delete-form #{form_class}", :method => :delete } ) do |f| -%>
+  <%= form_for(delete_object, :url => delete_path, :html => { :class => "ajax delete-form #{form_class}", :method => :delete } ) do |f| -%>
     <% if button_type == :image -%>
       <%= image_submit_tag '/images/icons/delete.png', :title => button_text, :width => '15', :height => '15', :alt => button_text, :class  => 'muck_ajax_delete_control' %>
     <% else -%>

data/app/views/shared/_field_error.erb

@@ -1,3 +1,7 @@
 <% if !field_error.nil? && field_error.errors.length > 0 -%>
-<ul id="field-errors"><%=field_error.errors.full_messages.map {|msg| content_tag(:li, msg)} %></ul>
+<ul id="field-errors">
+  <% field_error.errors.full_messages.each do |msg| -%>
+    <%= content_tag(:li, msg) %>
+  <% end -%>
+</ul>
 <% end -%>