muck-engine 0.4.14 → 0.4.15

data/VERSION

@@ -1 +1 @@
-0.4.14
+0.4.15

data/app/controllers/muck/helper_controller.rb

@@ -1,4 +1,4 @@
-class HelperController < ApplicationController
+class Muck::HelperController < ApplicationController
 
   def load_states_for_country
     country_id = params[:id]
@@ -8,7 +8,7 @@ class HelperController < ApplicationController
     # set cookies so we can remember the last value the user selected
     cookies[:prefered_country_id] = country_id
     respond_to do |format| 
-      format.js { render :json => {:states => @states, :label => label, :prompt => prompt}.as_json }
+      format.json { render :json => {:states => @states, :label => label, :prompt => prompt}.as_json }
     end
   end
   

data/app/models/country.rb

@@ -10,4 +10,52 @@
 
 class Country < ActiveRecord::Base
   
+  has_many :states
+  
+  named_scope :by_name, :order => "name ASC"
+  
+  def self.us
+    self.find_by_abbreviation('US')
+  end
+  
+  def self.uk_country?(country_id)
+    unless defined?(@@uk_country_ids)
+      uk_countries = Country.find(:all, :conditions => ["abbreviation in (?)", ['ENG', 'IE', 'WAL', 'SCT']])
+      @@uk_country_ids = uk_countries.map(&:id)
+    end
+    @@uk_country_ids.include?(country_id.to_i)
+  end
+  
+  def self.canada?(country_id)
+    @@canada_id ||= Country.find_by_abbreviation('CA').id
+    @@canada_id == country_id.to_i
+  end
+  
+  # Note that the strings from here are also hard coded into application.js
+  def self.build_state_prompts(country_id, any = false)
+    if uk_country?(country_id)
+      label = 'Choose County'
+      if any
+        prompt = 'Any County (or unknown)'
+      else
+        prompt = 'Please select a county'
+      end
+    elsif canada?(country_id)
+      label = 'Choose Province'
+      if any
+        prompt = 'Any Province (or unknown)'
+      else
+        prompt = 'Please select a Province'
+      end
+    else
+      label = 'Choose State'
+      if any
+        prompt = 'Any State (or unknown)'
+      else
+        prompt = 'Please select a state'
+      end
+    end
+    [label, prompt]
+  end
+  
 end

data/app/models/state.rb

@@ -10,4 +10,6 @@
 
 class State < ActiveRecord::Base
   belongs_to :country
+  named_scope :by_name, :order => "name ASC"
+  
 end

data/app/views/shared/_message_container.erb

@@ -0,0 +1,5 @@
+<div id="errorExplanation" class="<%=message_id%> <%=css_class%>" style="display:none;">
+  <div class="message" id="flashMessage">
+    <div id="<%=message_id%>" class="notice message"></div>
+  </div>
+</div>

data/config/muck_engine_routes.rb

@@ -1,5 +1,6 @@
 ActionController::Routing::Routes.draw do |map|
-  map.resources :helper, :controller => 'muck/helper', :collection => { :load_states_for_country => :get }
+  
+  map.connect 'load_states_for_country/:id.:format', :controller => 'muck/helper', :action => 'load_states_for_country'
   
   # admin
   map.admin '/admin', :controller => 'admin/muck/default', :action => 'index'

data/lib/muck_engine/flash_errors.rb

@@ -30,6 +30,12 @@ class MuckEngine
       end
     end
     
+    # Output a message container that is hidden by default.  This can be used to create html where an 
+    # ajax call can drop messages.  Just do something like jQuery('#message_id).html('some message');
+    def output_message_container(message_id = 'message_id', css_class = 'notify-box')
+      render :partial => 'shared/message_container', :locals => { :message_id => message_id, :css_class => css_class }
+    end
+    
     # Output a page update that will display messages in the flash
     def output_admin_messages(fields = nil, title = '', options = { :class => 'notify-box' }, flash_only = false)
       @fields = fields

data/muck-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.4.14"
+  s.version = "0.4.15"
 
   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-03-18}
+  s.date = %q{2010-03-21}
   s.description = %q{The base engine for the muck system.  Contains common tables, custom for, css and javascript.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -33,20 +33,13 @@ Gem::Specification.new do |s|
      "app/models/state.rb",
      "app/views/admin/default/index.html.erb",
      "app/views/admin/shared/_output_admin_messages.js.erb",
-     "app/views/forms/_base_field.html.erb",
-     "app/views/forms/_base_field.iphone.erb",
-     "app/views/forms/_color_picker_field.html.erb",
-     "app/views/forms/_color_picker_field.iphone.erb",
-     "app/views/forms/_default.html.erb",
-     "app/views/forms/_default.iphone.erb",
-     "app/views/forms/_field.html.erb",
-     "app/views/forms/_field.iphone.erb",
-     "app/views/forms/_field_with_tips.html.erb",
-     "app/views/forms/_field_with_tips.iphone.erb",
-     "app/views/forms/_menu_field.html.erb",
-     "app/views/forms/_menu_field.iphone.erb",
-     "app/views/forms/_tips.html.erb",
-     "app/views/forms/_tips.iphone.erb",
+     "app/views/forms/_base_field.erb",
+     "app/views/forms/_color_picker_field.erb",
+     "app/views/forms/_default.erb",
+     "app/views/forms/_field.erb",
+     "app/views/forms/_field_with_tips.erb",
+     "app/views/forms/_menu_field.erb",
+     "app/views/forms/_tips.erb",
      "app/views/layouts/admin.html.erb",
      "app/views/layouts/admin/_footer.html.erb",
      "app/views/layouts/admin/_head.html.erb",
@@ -62,21 +55,15 @@ Gem::Specification.new do |s|
      "app/views/scripts/_country_scripts.html.erb",
      "app/views/scripts/_parse_uri.html.erb",
      "app/views/scripts/_time_scripts.html.erb",
-     "app/views/shared/_delete.html.erb",
-     "app/views/shared/_delete.iphone.erb",
-     "app/views/shared/_error_box.html.erb",
-     "app/views/shared/_error_box.iphone.erb",
-     "app/views/shared/_field_error.html.erb",
-     "app/views/shared/_field_error.iphone.erb",
-     "app/views/shared/_flash_error_box.html.erb",
-     "app/views/shared/_flash_error_box.iphone.erb",
-     "app/views/shared/_flash_messages.html.erb",
-     "app/views/shared/_flash_messages.iphone.erb",
-     "app/views/shared/_growl.html.erb",
-     "app/views/shared/_growl.iphone.erb",
-     "app/views/shared/_growl_box.html.erb",
-     "app/views/shared/_growl_box.iphone.erb",
-     "app/views/shared/_no_result.html.erb",
+     "app/views/shared/_delete.erb",
+     "app/views/shared/_error_box.erb",
+     "app/views/shared/_field_error.erb",
+     "app/views/shared/_flash_error_box.erb",
+     "app/views/shared/_flash_messages.erb",
+     "app/views/shared/_growl.erb",
+     "app/views/shared/_growl_box.erb",
+     "app/views/shared/_message_container.erb",
+     "app/views/shared/_no_result.erb",
      "app/views/shared/page_alert.js.erb",
      "config/muck_engine_routes.rb",
      "db/migrate/20090402234137_create_languages.rb",

data/public/javascripts/muck-countries.js

@@ -19,7 +19,7 @@ function setup_country(force_load){
 	}
 
 	if(force_load || state_id == '' || state_id == null || state_id == -1) {
-		jQuery.getJSON("/helper/load_states_for_country/" + country_id + ".js", function(data){
+		jQuery.getJSON("/load_states_for_country/" + country_id + ".json", function(data){
 			var options = '';
 			jQuery("#counties-container").hide();
 			jQuery('#states-container label').html(data.label);

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 14
-  version: 0.4.14
+  - 15
+  version: 0.4.15
 platform: ruby
 authors: 
 - Justin Ball
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 -06:00
+date: 2010-03-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,20 +92,13 @@ files:
 - app/models/state.rb
 - app/views/admin/default/index.html.erb
 - app/views/admin/shared/_output_admin_messages.js.erb
-- app/views/forms/_base_field.html.erb
-- app/views/forms/_base_field.iphone.erb
-- app/views/forms/_color_picker_field.html.erb
-- app/views/forms/_color_picker_field.iphone.erb
-- app/views/forms/_default.html.erb
-- app/views/forms/_default.iphone.erb
-- app/views/forms/_field.html.erb
-- app/views/forms/_field.iphone.erb
-- app/views/forms/_field_with_tips.html.erb
-- app/views/forms/_field_with_tips.iphone.erb
-- app/views/forms/_menu_field.html.erb
-- app/views/forms/_menu_field.iphone.erb
-- app/views/forms/_tips.html.erb
-- app/views/forms/_tips.iphone.erb
+- app/views/forms/_base_field.erb
+- app/views/forms/_color_picker_field.erb
+- app/views/forms/_default.erb
+- app/views/forms/_field.erb
+- app/views/forms/_field_with_tips.erb
+- app/views/forms/_menu_field.erb
+- app/views/forms/_tips.erb
 - app/views/layouts/admin.html.erb
 - app/views/layouts/admin/_footer.html.erb
 - app/views/layouts/admin/_head.html.erb
@@ -121,21 +114,15 @@ files:
 - app/views/scripts/_country_scripts.html.erb
 - app/views/scripts/_parse_uri.html.erb
 - app/views/scripts/_time_scripts.html.erb
-- app/views/shared/_delete.html.erb
-- app/views/shared/_delete.iphone.erb
-- app/views/shared/_error_box.html.erb
-- app/views/shared/_error_box.iphone.erb
-- app/views/shared/_field_error.html.erb
-- app/views/shared/_field_error.iphone.erb
-- app/views/shared/_flash_error_box.html.erb
-- app/views/shared/_flash_error_box.iphone.erb
-- app/views/shared/_flash_messages.html.erb
-- app/views/shared/_flash_messages.iphone.erb
-- app/views/shared/_growl.html.erb
-- app/views/shared/_growl.iphone.erb
-- app/views/shared/_growl_box.html.erb
-- app/views/shared/_growl_box.iphone.erb
-- app/views/shared/_no_result.html.erb
+- app/views/shared/_delete.erb
+- app/views/shared/_error_box.erb
+- app/views/shared/_field_error.erb
+- app/views/shared/_flash_error_box.erb
+- app/views/shared/_flash_messages.erb
+- app/views/shared/_growl.erb
+- app/views/shared/_growl_box.erb
+- app/views/shared/_message_container.erb
+- app/views/shared/_no_result.erb
 - app/views/shared/page_alert.js.erb
 - config/muck_engine_routes.rb
 - db/migrate/20090402234137_create_languages.rb

data/app/views/forms/_base_field.iphone.erb

@@ -1,11 +0,0 @@
-<%= pre_html %>
-<% if is_checkbox -%>
-	<%= field_element %>
-	<%= label_element %>
-<% else -%>
-	<%= label_element %>
-	<%= 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 %>

data/app/views/forms/_color_picker_field.iphone.erb

@@ -1,27 +0,0 @@
-<% color = value
-	 html_id = '_' + id.to_s + '_' + field_name %>
-<div <%= wrapper_id.nil? ? '' : "id=\"#{wrapper_id}\"" -%> class="form-row color-selector-container">
-	<%= render :partial => 'forms/base_field', :locals => local_assigns %>
-	<div id="colorSelector<%=html_id%>" class="color-selector">
-		<div id="colorSelectorDisplay<%=html_id%>" style="background-color:#<%=color%>;"></div>
-	</div>
-	<script type="text/javascript" language="JavaScript">
-	jQuery(document).ready(function() {
-		jQuery('#colorSelector<%=html_id%>').ColorPicker({
-			color: '#<%=color%>',
-			onShow: function (colpkr) {
-				jQuery(colpkr).fadeIn(100);
-				return false;
-			},
-			onHide: function (colpkr) {
-				jQuery(colpkr).fadeOut(100);
-				return false;
-			},
-			onChange: function (hsb, hex, rgb) {
-				jQuery('#colorSelectorDisplay<%=html_id%>').css('backgroundColor', '#' + hex);
-				jQuery('#<%=field_name%>').val(hex);
-			}
-		});
-	});
-	</script>
-</div>

data/app/views/forms/_default.iphone.erb

@@ -1 +0,0 @@
-<%= field_element %>

data/app/views/forms/_field.iphone.erb

@@ -1,3 +0,0 @@
-<div <%= wrapper_id.nil? ? '' : "id=\"#{wrapper_id}\"" -%> class="form-row">
-	<%= render :partial => 'forms/base_field', :locals => local_assigns %>
-</div>

data/app/views/forms/_field_with_tips.iphone.erb

@@ -1,4 +0,0 @@
-<div id="<%= field_name %>-container" class="form-row">
-	<%= render :partial => 'forms/base_field', :locals => local_assigns  %>
-	<%= render :partial => 'forms/tips', :locals => local_assigns  %>
-</div>

data/app/views/forms/_menu_field.iphone.erb

@@ -1,4 +0,0 @@
-<div <%= wrapper_id.nil? ? '' : "id=\"#{wrapper_id}\"" -%> class="chooseMenu">
-	<%= render :partial => 'forms/base_field', :locals => local_assigns %>
-  <%= render :partial => 'forms/tips', :locals => local_assigns  %>
-</div>

data/app/views/forms/_tips.iphone.erb

@@ -1,7 +0,0 @@
-<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>
-<% if tip_key -%>
-  <div class="tip-key" style="display:none;"><%= tip_key %></div>
-  <div class="tip-id" style="display:none;"><%= field_name %></div>
-<% end -%>

data/app/views/shared/_delete.iphone.erb

@@ -1,15 +0,0 @@
-<% 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| -%>
-    <% 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 -%>
-      <%= submit_tag button_text, :title => button_text, :class  => 'muck_ajax_delete_control' %>
-    <% end -%>
-  <% end -%>
-<% end -%>
-<% unless defined?(@delete_waiting_text_inserted) -%>
-  <div id="muck_ajax_delete_control_message" style="display:none;"><span class="waiting"><%= t('muck.general.deleting') %></span></div>
-  <% @delete_waiting_text_inserted = true -%>
-<% end -%>

data/app/views/shared/_error_box.iphone.erb

@@ -1,9 +0,0 @@
-<div <%=css_class%> id="errorExplanation">
-  <% if !title.blank? -%>
-    <h2><%= title %></h2>
-  <% end -%>
-  <%= flash_html %>
-  <%= field_errors %>
-  <%= extra_html %>
-</div>
-<%= render(:partial => 'shared/growl') -%>

data/app/views/shared/_field_error.iphone.erb

@@ -1,3 +0,0 @@
-<% 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>
-<% end -%>

data/app/views/shared/_flash_error_box.iphone.erb

@@ -1,4 +0,0 @@
-<div <%=css_class%> id="errorExplanation">
-  <%= flash_html %>
-</div>
-<%= render(:partial => 'shared/growl') -%>

data/app/views/shared/_flash_messages.iphone.erb

@@ -1,7 +0,0 @@
-<% if flash.keys.any? {|key| flash[key].length > 0} -%>
-  <div id="flashMessage" class="message">
-    <% flash.each do |key, msg| -%>
-      <%= content_tag :div, msg, :class => [key, " message"], :id => "notice_#{key}" %>
-    <% end -%>
-  </div>
-<% end -%>

data/app/views/shared/_growl.iphone.erb

@@ -1,16 +0,0 @@
-<% if GlobalConfig.growl_enabled -%>
-  <script type="text/javascript">
-  jQuery(document).ready(function() {
-    jQuery('#errorExplanation').hide();
-    var message = jQuery('#errorExplanation').html();
-    var title = jQuery('#errorExplanation h2').html();
-    if(message) {
-      if (jQuery('#field-errors').length > 0){
-        jQuery.jGrowl.error(message, {header:title});
-      } else {
-        jQuery.jGrowl.info(message, {header:title});
-      }
-    }
-  });
-  </script>
-<% end -%>

data/app/views/shared/_growl_box.iphone.erb

@@ -1,3 +0,0 @@
-<% content_for :javascript do -%>
-  jQuery.jGrowl('<%=msg%>', <%=options%>);
-<% end -%>