motr 0.0.2 → 0.0.3

data/config/en.yml

@@ -0,0 +1,2 @@
+en:
+  motr:

data/lib/generator/motr/compass_generator.rb

@@ -0,0 +1,14 @@
+module Motr
+  module Generators
+    class CompassGenerator < Rails::Generators::Base
+      source_root File.expand_path("../../templates", __FILE__)
+
+      desc "Generates starter files in app/assets/stylesheets for using Compass in your app"
+
+      def copy_files
+        directory File.expand_path("../../templates/compass", __FILE__), "app/assets/stylesheets"
+      end
+
+    end
+  end
+end

data/lib/generator/motr/install_generator.rb

@@ -0,0 +1,21 @@
+module Motr
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path("../../templates", __FILE__)
+
+      desc "Creates an initializer for Motr and copy locale files to your application."
+
+      def copy_initializer
+        template "motr.rb", "config/initializers/motr.rb"
+      end
+
+      def copy_locale
+        copy_file "../../../config/locales/en.yml", "config/locales/motr.en.yml"
+      end
+
+      def show_post_install_notes
+        readme "post_install" if behavior == :invoke
+      end
+    end
+  end
+end

data/lib/generator/motr/motr_generator.rb

@@ -0,0 +1,8 @@
+module Motr
+  module Generators
+    class MotrGenerator < Rails::Generators::NamedBase
+      namespace "motr"
+      source_root File.expand_path("../templates", __FILE__)
+    end
+  end
+end

data/lib/generator/templates/compass/ie.scss

@@ -0,0 +1,19 @@
+/*
+	IE css. Because IE sucks.
+*/
+
+@import "includes/base";
+/////////////////////////////////////
+// Disable browser specific items in 
+// css since this is an ie only stylesheet
+/////////////////////////////////////
+$experimental-support-for-mozilla:false;
+$experimental-support-for-webkit:false;
+$experimental-support-for-opera:false; 
+$experimental-support-for-khtml:false;
+/////////////////////////////////////
+// PIE Support
+/////////////////////////////////////
+$experimental-support-for-pie:true;
+$pie-behavior: url("/stylesheets/PIE.htc");
+@import "includes/mixins";

data/lib/generator/templates/compass/includes/_base.scss

@@ -0,0 +1,77 @@
+/*
+	Sets up any compass imports, as well as variables used throughout css files. This way all files can access the libraries, but without 
+	adding additional code to every css file.
+*/
+
+////////////////////////////////////////////////
+// Import Blueprint defaults
+////////////////////////////////////////////////
+@import "blueprint/grid";
+@import "blueprint/typography";
+@import "blueprint/form";
+@import "blueprint/interaction";
+@import "blueprint/debug";
+
+////////////////////////////////////////////////
+// Blueprint grid setup.
+////////////////////////////////////////////////
+
+$blueprint-container-size: 970px;
+$blueprint-grid-margin: 10px;
+$blueprint-grid-width:30px;
+
+/////////////////////////////////////////////////
+// Import CSS3 Goodness
+/////////////////////////////////////////////////
+@import "compass/utilities/sprites";
+@import "compass/css3/text-shadow";
+@import "compass/css3/box-shadow";
+@import "compass/css3/border-radius";
+@import "compass/css3/gradient";
+@import "compass/css3/font-face";
+@import "compass/css3/pie";
+@import "compass/css3/opacity";
+@import "compass/utilities/general/min";
+@import "compass/utilities/lists";
+@import "compass/typography/vertical_rhythm";
+
+$experimental-support-for-pie: false; // Enable this in ie.css so mixins can enable pie.
+$legacy-support-for-ie6: false;
+
+$default-text-shadow-color:black;
+$default-text-shadow-h-offset:1px;
+$default-text-shadow-v-offset:1px;
+$default-text-shadow-blur:1px;
+$default-border-radius:10px;
+
+$blueprint-font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;
+
+// Default color vars
+$font-color: #333;
+
+// Default blueprint colors (defaults listed)
+// Links
+$link-color:blue;
+$link-hover-color:darken(desaturate(blue, 10%), 15%);
+$link-focus-color: $link-hover-color;
+$link-active-color: blue;
+$link-visited-color: darken(blue, 20%);
+
+// Notifications
+$feedback-border-color: #dddddd;
+$success-color: #3e5a3d;
+$success-bg-color: #ddf5c4;
+$success-border-color: #a7da74;
+$notice-color: #514721;
+$notice-bg-color: #fff6bf;
+$notice-border-color: #ffd324;
+$info-color: #be9109;
+$info-bg-color: #fbf1d2;
+$info-border-color: #ffcc33;
+$error-color: #bd132a;
+$error-bg-color: #fde0e4;
+$error-border-color: #E41D38;
+
+// Table colors
+$blueprint-table-header-color: darken(blue, 15%);
+$blueprint-table-stripe-color: $light_blue;

data/lib/generator/templates/compass/includes/_defaults.scss

@@ -0,0 +1,173 @@
+/*
+	Defaults file for layouts, sets up the grid, forms, and typography. Used as a separate file so only css files which 
+	manage layouts include the extra code.
+*/
+// Import libraries
+@import "includes/base";
+@import "includes/mixins";
+// Reset 
+@import "blueprint/reset";
+
+////////////////////////////////////////////////
+// Debugging
+////////////////////////////////////////////////
+@if($debug){
+	#wrapper{ @include showgrid("/images/grid.png"); background-position-x:10px; }
+}
+
+///////////////////////////////////////////////
+// Setup typography
+///////////////////////////////////////////////
+
+@include blueprint-typography;
+///////////////////////////////////////////////
+// Setup forms and buttons
+///////////////////////////////////////////////
+
+form{ 	@include blueprint-form-borders; 
+		@include blueprint-form-layout; 
+	
+	ol.split{ 
+		display:block; 
+		clear:both; 
+		margin:-.5em 0px; 
+		@include pie-clearfix;
+		
+		li{ 
+			float:left; 
+			margin:0px 1em 0px 0px; 
+			vertical-align:middle;
+			
+			label, 
+			input[type=text], 
+			input[type=password], 
+			input[type=email]{ 
+				display:block; 
+			}
+			
+			select{ margin:.75em 0px; }
+			
+		}
+	}
+	ol{ 
+		list-style-type:none !important; 
+		margin:0px; 
+		padding:0px; 
+		padding-right:10px;
+		
+		li{ padding:.5em 0px;			
+			&.clear{ clear:both; }
+			&.buttons{ clear:both; padding:.25em 0px 0px 0px; }
+			&.inline label{ display:inline !important; }
+			&.multifield{
+				input, select{ display:inline !important; }
+			}
+			
+			ol{ @extend ol.split; }
+		}
+		
+		label{ display:block; }
+	}
+	
+	ol.inline li.label{ display:inline !important; }
+	label abbr{ 
+		outline:none; 
+		border:none; 
+		color:red; 
+	}
+	input[type=text], 
+	input[type=password], 
+	input[type=email], 
+	textarea{ 
+		@include border-radius(2px); padding:.65em;
+		&:focus{ 
+			outline:none; 
+			border-color:#333; 
+		}
+	}
+	select{ border-style:solid !important; 
+		&:focus{ outline:none; }
+	}
+	select[multiple=multiple]{ 
+		@include border-radius(2px); 
+		border-color:#ccc; 
+	}
+	input[type=checkbox], 
+	input[type=radio]{ 
+		display:inline; 
+		margin-right:1em; 
+		vertical-align:baseline; 
+		width:auto; 
+	}
+
+	span.field_with_errors{ 
+		padding:0px; 
+		line-height:1; 
+		margin:0px; 
+		position:relative;
+		
+		input[type=text],
+		input[type=password], 
+		input[type=email], 
+		textarea{ 
+			border:1px solid $error-border-color; 
+			background:$error-bg-color; 
+			margin-bottom:0px;
+		}
+		
+		span.error_for_field{ 
+			line-height:.75em; 
+			font-size:.9em; 
+			font-style:italic; 
+			color:$error-color; 
+			display:block; 
+		}
+	}
+}
+
+a.button{ @include anchor-button; }
+button.button{ @include button-button; position:relative; }
+a.button, button.button{ @extend .button; }
+
+////////////////////////////////////
+// Notifications
+////////////////////////////////////
+div.error, 
+div.notice, 
+div.success, 
+div.alert{ 
+	padding: .8em; 
+	border-width:.17em; 
+	border-style:solid; 
+	position:relative; 
+}
+
+.error, .alert { background-color:$error-bg-color !important; border-color:$error-border-color; color:$error-color;  }
+.notice        { background-color:$info-bg-color !important; border-color:$info-border-color; color:$info-color; }
+.success       { background-color:$success-bg-color !important; border-color:$success-border-color; color:$success-color; }
+
+div.flash_message{ 
+	
+	@include border-radius(5px); 
+	background-repeat:no-repeat; 
+	padding-left:35px; 
+	background-position:10px 45%;
+	text-align:left; 
+	padding:0px; 
+	height:32px; 
+	text-indent:35px; 
+	line-height:32px; 
+	margin-bottom:1.5em;
+	
+	span{ 
+		position:absolute; 
+		top:0px; 
+		right:1em; 
+		cursor:pointer; 
+		cursor:hand; 
+		font-family:'Arial Black'; 
+		@include opacity(0.5); 
+	
+		&:hover{ @include opacity(1); }
+	}
+}

data/lib/generator/templates/compass/includes/_mixins.scss

@@ -0,0 +1,40 @@
+@function font($name, $base_url){
+	@include font-face($name,  font-files('#{$base_url}.woff', woff, '#{$base_url}.ttf', truetype), '#{$base_url}.eot');
+}
+
+@mixin pie_option{
+	@if $experimental-support-for-pie{ @include pie; }
+}
+
+@mixin gradient($start:blue, $end:false, $darken:6%){
+	@if not $end{ $end:darken($start, $darken); }
+	@include background(linear-gradient($start, $end));
+}
+
+// Wireframing
+@mixin wf($color:#dedede){
+	@if($debug or $wireframe){ 
+		background-color:$color; position:relative;
+		span.wireframe_title{ position:absolute; bottom:0px; left:0px; font-size:10px; background:lighten($color, 5%); border:1px solid darken($color, 10%); padding:.25em; }
+	}
+}
+
+////////////////////////////////////
+// Button defaults.
+////////////////////////////////////
+
+@import "blueprint/buttons";
+// Button defaults
+$blueprint-button-font-family:$blueprint-font-family;
+$blueprint-button-background-color:#333;
+$blueprint-button-border-color:darken($blueprint-button-background-color, 10%);
+$blueprint-button-font-color:#fff;
+$blueprint-button-hover-background-color:#555;
+$blueprint-button-hover-border-color:darken($blueprint-button-hover-background-color, 10%);
+$blueprint-button-hover-font-color:$blueprint-button-font-color;
+$blueprint-button-active-background-color:#444;
+$blueprint-button-active-border-color:darken($blueprint-button-active-background-color, 10%);
+$blueprint-button-active-font-color:white;
+
+.button{ @include button-colors; @include button-active-colors; @include button-hover-colors; }
+.rounded{ @include border-radius(10px); @include pie_option; }

data/lib/generator/templates/compass/screen.scss

@@ -0,0 +1 @@
+@import 'includes/defaults';

data/lib/generator/templates/motr.rb

@@ -0,0 +1,25 @@
+##
+# Configures Motr, including extensions/modules.
+# See information below for more info
+# 
+Motr.configure do |config|
+  
+  # => Forms configuration
+  # Configures various options for the form builder
+  # config.forms.do |forms|
+  #  The html class to be used when wrapping a field with an error
+  #   forms.error_class = 'field_with_errors'
+  #   
+  # The html class to be added to the "message" on each field 
+  #   forms.message_error_class = 'errors_for_field'
+  # 
+  # The ERB based error template to be used when wrapping an errored field
+  # It provides the methods "error_class", "message_error_class", and "messages" (array of errors)
+  #   forms.error_template = %{ <span class="<%= error_class %>"><%= html_tag %><span class="<%= message_error_class %>"><%= [messages].flatten.join(",") %></span>}
+  # 
+  # The default form builder to use site-wide
+  #   forms.default_builder = Motr::Forms::Builder
+  # 
+  # end
+  
+end

data/lib/generator/templates/post_install

@@ -0,0 +1,8 @@
+
+===============================================================================
+
+Final configuration:
+
+Nada right now.. easy enough?
+
+===============================================================================

data/lib/motr.rb

@@ -2,8 +2,15 @@ require 'rails'
 require 'active_support/dependencies'
 require 'set'
 
+require 'motr/forms'
+
 module Motr
   
+  module Controller
+    autoload :Responder,    'motr/controller/responder'
+    autoload :ScriptEvents, 'motr/controller/script_events'
+  end
+  
   module Helpers
     autoload :LayoutHelpers, 'motr/helpers/layout_helpers'
     autoload :Navigation,    'motr/helpers/navigation'
@@ -14,8 +21,17 @@ module Motr
     autoload :MotrError,      'motr/errors/motr_error'
     autoload :InvalidOptions, 'motr/errors/invalid_options'
   end
+  
+  # Support initializer configuration
+  def self.configure #:nodoc:
+    yield self
+  end
+  
+  # Support configuration of the forms module
+  def self.forms #:nodoc:
+    yield Motr::Forms
+  end
 
 end
 
-require 'motr/forms'
 require 'motr/rails'

data/lib/motr/controller/responder.rb

@@ -0,0 +1,37 @@
+require 'action_controller/base'
+
+module Motr
+  module Controller
+    
+    ##
+    # 
+    # A custom responder which extends the default functionality of respond_with to handle
+    # more advanced javascript functionality, as well as flash messages.
+    # 
+    # Slightly modeled after José Valim's Responders gem (https://github.com/plataformatec/responders)
+    # 
+    # @see (https://github.com/rails/rails/blob/master/actionpack/lib/action_controller/metal/responder.rb) for more info
+    # 
+    class Responder <  ActionController::Responder
+      
+      def initialize(controller, resources, options = {}) #:nodoc:
+        super
+        flash = (format == :js) ? controller.flash : controller.flash.now
+        [:success, :notice, :error].each do |key|
+          flash[key] = options.delete(key) if options[key].present?
+        end        
+      end
+      
+      ##
+      # Override to_js to set a +X-Flash-Messages+ header to be utilized by an ajax response.
+      # 
+      def to_js #:nodoc:
+        flash = controller.flash.now
+        controller.response['X-Flash-Messages'] = flash.to_json if [:success, :notice, :error].detect{ |key| flash[key].present? }
+        defined?(super) ? super : to_format        
+      end
+      
+    end
+    
+  end  
+end

data/lib/motr/controller/script_events.rb

@@ -0,0 +1,77 @@
+require 'action_controller/base'
+
+module Motr
+  module Controller
+    
+    ##
+    # Enables triggering javascript events from controllers. This helps with extraction of javascript from 
+    # actual view templates. Since by default Rails' respond_with will render a html template on a js request 
+    # where there is no .js.erb template, we can capture that content and trigger a javascript event with it.
+    # 
+    # @option options [Symbol] :type The type of callback to use (only supports :jquery right now)
+    #
+    # @example 
+    #   In your controller:
+    #     controller SomeResourceController < ApplicationController
+    #       respond_to :html, :js
+    #       enable_script_events :only => :create
+    # 
+    #       def create
+    #         # some create functionality here
+    #         # @some_resource.name = "Test"
+    #         respond_with(@some_resource)
+    #       end
+    # 
+    #     end
+    # 
+    #   With the view "create.html.erb"
+    #   
+    #   <div id="resource"><%= @some_resource.name %></div>
+    # 
+    #   Will return (where the last param is an object notation of any params passed (after filtering))
+    # 
+    #     jQuery.trigger("some_resource:create", "<div id=\"resource\">Test</div>", {});
+    #
+    # 
+    module ScriptEvents
+      
+      def enable_script_events(options = {})  #:nodoc:
+        
+        
+        after_filter(options) do
+          
+          # TODO: Possibly support other js libraries? I mean... does anyone care? I don't
+          #event_type = options.delete(:type) || :jquery
+          event_type   = :jquery
+          callback_str = case event_type.to_s
+            when 'prototype' then "alert('sorry, no prototype love');"
+            else "jQuery.event.trigger('%s:%s', [%s, %s]);"
+          end
+          
+          return true unless response.content_type.to_s.match(/javascript/i)
+          response_params = request.filtered_parameters.dup
+          
+          cname      = response_params.delete('controller').to_s.underscore
+          aname      = response_params.delete('action').to_s
+          escape_map = {
+                  '\\'    => '\\\\',
+                  '</'    => '<\/',
+                  "\r\n"  => '\n',
+                  "\n"    => '\n',
+                  "\r"    => '\n',
+                  '"'     => '\\"',
+                  "'"     => "\\'" }
+          
+          response_params.delete("format")
+          json_params   = response_params.to_json#.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { escape_map[$1] }
+          old_body      = response.body.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { escape_map[$1] }
+          response.body = callback_str % [cname, aname, old_body.inspect, json_params.html_safe]
+          
+        end
+        
+      end
+      
+    end
+    
+  end  
+end

data/lib/motr/forms/base.rb

@@ -54,7 +54,8 @@ module Motr
       # @return [Boolean]
       #
       def errors_on_attribute?(method)
-        !(@object.nil? || @object.errors.empty? || !@object.errors.key?(method.to_sym) || [@object.errors[method.to_sym]].flatten.empty?)
+        return false if @object.nil?
+        !(@object.errors.empty? || !@object.errors.key?(method.to_sym) || [@object.errors[method.to_sym]].flatten.empty?)
       end
       
       ##
@@ -81,6 +82,17 @@ module Motr
         if_condition ? !!condition : !condition
       end
       
+      ##
+      # 
+      # Checks an options hash to determine if a required method/attribute was overridden manually
+      # @param [Hash] options The options hash to check
+      #
+      #
+      def required_by_option?(options)
+        req = (options.is_a?(Hash) ? options.stringify_keys[:required] : options)
+        !(req.to_s === 'false' || req.nil?)
+      end
+      
       ##
       # 
       # Wrapper method used by all form fields to customize the output
@@ -92,7 +104,7 @@ module Motr
       # @return [String] Rendered HTML tag for the element
       # 
       def render_field_as_custom(helper_method, method, *args)
-        
+
         @current_field_type = helper_method
         
         options = args.extract_options!
@@ -109,11 +121,12 @@ module Motr
         # Add a required attribute to the field if it is required
         # Skip if false was passed as the required option
         # 
-        options[:required] = "required" if attribute_required?(method) && options[:required].to_s != 'false'
+        options[:required] = "required" if attribute_required?(method) && options.delete(:required).to_s !=  'false'
         options['data-validates-uniqueness'] = "true" if validates_uniqueness?(method)
         
-        result = send(:"_super_#{helper_method}", method, *(args << options))
-        render_field_with_errors(method, result, @object.errors[method])
+        result   = send(:"_super_#{helper_method}", method, *(args << options))
+        messages = @object.nil? ? [] : @object.errors[method]
+        render_field_with_errors(method, result, messages)
         
       end
       

data/lib/motr/forms/builder.rb

@@ -29,19 +29,19 @@ module Motr
         text ||= method.to_s.humanize
         
         options.stringify_keys!
-        klasses = (options.delete([:class]) || "").split(" ")
+        klasses = (options.delete(['class']) || "").split(" ")
         klasses << Motr::Forms.error_class if errors_on_attribute?(method)
-        options[:class] = klasses.join(" ") unless klasses.compact.empty?
+        options['class'] = klasses.join(" ") unless klasses.compact.empty?
         
-        text = "#{text} <abbr title='Required'>*</abbr>".html_safe if attribute_required?(method)
+        text = "#{text} <abbr title='Required'>*</abbr>".html_safe  if attribute_required?(method) || required_by_option?(options.delete('required'))        
         super(method, text, options, &block)
         
       end
       
       ##
       # 
-      # Creates a button tag to be used in a form instead of the default submit
-      # This makes CSS styling easier
+      # Creates a button tag to be used in a form instead of the default input[type=submit]
+      # to help make CSS styling easier
       # 
       # @param [String] value The text for the button
       # @param [Hash] options HTML options to be passed to the button
@@ -52,12 +52,63 @@ module Motr
         value, options = nil, value if value.is_a?(Hash)
         value ||= submit_default_value
 
-        value = [image_tag(icon, :class => 'icon'), value].join(' ') if icon = options.delete(:icon)
-                
+        value    = [image_tag(icon, :class => 'icon'), value].join(' ') if icon = options.delete(:icon)
+        klasses = (options.delete(:class) || "").split(" ")
+        klasses << "button"
+        options['class'] = klasses.join(" ")
         content_tag(:button, value.to_s.html_safe, options.reverse_merge!({ "type" => "submit", "name" => "commit" }))
         
       end
       
+      ##
+      # 
+      # Generate a select tag with the 50 US states as options
+      # 
+      # @param [Symbol] method The object method/attribute to be used
+      # @param [Hash] options Same as Rails' select options hash
+      # @option options [Symbol] :international Include an international option
+      # @option options [Symbol] :abbreviate Use an abbreviated version of the state name for the value
+      # @param [Hash] html_options Same as Rails' html_options hash
+      # 
+      # @return [String] HTML select tag
+      # 
+      def state_select(method, options = {}, html_options = {})
+        abbr = options.delete(:abbreviate)
+        abbr = !(abbr.nil? || abbr === false)
+        select(method, @template.options_for_select(options_for_state_select(abbr, options.delete(:international)), @object.try(:state)), options, html_options)        
+      end
+      
+      protected
+      
+      ##
+      # 
+      # Returns a list of US states as an array
+      # 
+      # @param [Boolean] abbreviate Abbreviate the value
+      # @param [Boolean, String] incl_international Include an additional state for "International"
+      # 
+      # @return [Array] An array of states
+      # 
+      def options_for_state_select(abbreviate = false, incl_international = false)
+        incl_international ||= false
+        state_list = [
+            ['Alabama', "AL"],['Alaska', "AK"],['Arizona', "AZ"],['Arkansas', "AR"],['California', "CA"],['Colorado', "CO"],
+          	['Connecticut', "CT"],['District of Columbia', "DC"],['Delaware', "DE"],['Florida', "FL"],['Georgia', "GA"],
+          	['Hawaii', "HI"],['Idaho', "ID"],['Illinois', "IL"],['Indiana', "IN"],['Iowa', "IA"],['Kansas', "KS"],['Kentucky', "KY"],
+          	['Louisiana', "LA"],['Maine', "ME"],['Maryland', "MD"],['Massachusetts', "MA"],['Michigan', "MI"],['Minnesota', "MN"],
+          	['Mississippi', "MS"],['Missouri', "MO"],['Montana', "MT"],['Nebraska', "NE"],['Nevada', "NV"],['New Hampshire', "NH"],
+          	['New Jersey', "NJ"],['New Mexico', "NM"],['New York', "NY"],['North Carolina', "NC"],['North Dakota', "ND"],
+          	['Ohio', "OH"],['Oklahoma', "OK"],['Oregon', "OR"],['Pennsylvania', "PA"],['Rhode Island', "RI"],['South Carolina', "SC"],
+          	['South Dakota', "SD"],['Tennessee', "TN"],['Texas', "TX"],['Utah', "UT"],['Vermont', "VT"],['Virginia', "VA"],['Washington', "WA"],
+          	['West Virginia', "WV"],['Wisconsin', "WI"],['Wyoming', "WY"]
+          	
+        ].map do |state|
+          (abbreviate ? state : [state.first, state.first])
+        end
+        state_list << ['International', incl_international] unless incl_international === false
+        state_list
+      end
+      
     end
     
   end

data/lib/motr/helpers/elements.rb

@@ -53,7 +53,9 @@ module Motr
         
         wrapper = attrs.delete(:wrapper) || :div
         closer  = attrs.delete(:closer)
-        closer ||= "<span>X</span>" unless closer === false
+        unless closer === false
+          closer ||= "<span>X</span>"
+        end
         klasses = (attrs.delete(:class) || "").split(" ")
         klasses << "flash_message"  
         content = ""    
@@ -61,7 +63,7 @@ module Motr
         flash.each_key do |k|
           klasses << "flash_message_#{k.to_s.underscore}"
           msg_attrs = attrs.merge(:class => [k.to_s, klasses].flatten.join(' '))
-          content.concat content_tag(wrapper, "#{flash[k]} #{closer}", msg_attrs)
+          content.concat content_tag(wrapper, "#{flash[k]} #{closer}".html_safe, msg_attrs).html_safe
         end    
         
         content.html_safe    

data/lib/motr/helpers/layout_helpers.rb

@@ -39,7 +39,7 @@ module Motr
           end          
         end        
         response << javascript_include_tag(*args.map(&:to_s), :cache => cache)
-                
+        response.html_safe
       end
       
       ##
@@ -81,6 +81,24 @@ module Motr
         "#{cname}_#{aname}"
       end
       
+      ##
+      # 
+      # Convenienve method to create a page title for the <title></title> tag.
+      # 
+      # @param [String] content The text for the page title
+      # @return [String] The provided content
+      # @example Set the page title from a view template
+      #   <%= page_title('This is my page title') %>
+      # 
+      #   # In the layout:
+      #   <title><%= page_title %></title> #=> <title>This is my page title</title>
+      # 
+      def page_title(content = nil)
+        _create_variable(:__page_title, content, false) and return unless content.nil?
+        return _retrieve_variable(:__page_title) if content_for?(:__page_title)
+        return ""
+      end
+      
       ##
       # 
       # Convenience method for content_for allowing for single-line variable creation. Also defines a method that can be

data/lib/motr/helpers/navigation.rb

@@ -28,7 +28,8 @@ module Motr
         
         link_attrs    = update_link_attrs(path, attrs)
         wrapper_attrs = link_attrs.delete(:wrapper)      
-        content_tag(wrapper, link_to(text, path, link_attrs), wrapper_attrs)
+        child_link    = link_to(text, path, link_attrs)
+        wrapper === false ? child_link : content_tag(wrapper, child_link, wrapper_attrs)
         
       end
       
@@ -60,10 +61,10 @@ module Motr
       # 
       def navigation(text, path, attrs = {}, wrapper = :li, container = :ol, &block)
 
-        wrapper_attrs = attrs.delete(:wrapper)        
-        parent_link   = nav_link_to(text, path, attrs)
-        child_links   = content_tag(container, capture(&block), wrapper_attrs)
+        wrapper_attrs = attrs.delete(:wrapper)
         link_attrs    = update_link_attrs(path, attrs.merge(:wrapper => (attrs.delete(:item) || {}) ))
+        parent_link   = nav_link_to(text, path, attrs, false)
+        child_links   = content_tag(container, capture(&block), wrapper_attrs)        
 
         content_tag(wrapper, (parent_link << child_links), wrapper_attrs)
         

data/lib/motr/rails.rb

@@ -8,6 +8,10 @@ module Motr
     
     initializer :after_initialize do
       ActionView::Base.send :default_form_builder=, Motr::Forms.default_builder
+      ApplicationController.class_eval do 
+        self.responder = Motr::Controller::Responder
+      end
+      ActionController::Base.extend Motr::Controller::ScriptEvents
     end
     
   end

data/lib/motr/version.rb

@@ -1,3 +1,3 @@
 module Motr #:nodoc:
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.3".freeze
 end

metadata

@@ -2,7 +2,7 @@
 name: motr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Brent Kirby
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 -04:00
+date: 2011-05-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,6 +113,18 @@ extra_rdoc_files: []
 files: 
 - app/helpers/motr_helper.rb
 - lib/config/locales/en.yml
+- lib/generator/motr/compass_generator.rb
+- lib/generator/motr/install_generator.rb
+- lib/generator/motr/motr_generator.rb
+- lib/generator/templates/compass/ie.scss
+- lib/generator/templates/compass/includes/_base.scss
+- lib/generator/templates/compass/includes/_defaults.scss
+- lib/generator/templates/compass/includes/_mixins.scss
+- lib/generator/templates/compass/screen.scss
+- lib/generator/templates/motr.rb
+- lib/generator/templates/post_install
+- lib/motr/controller/responder.rb
+- lib/motr/controller/script_events.rb
 - lib/motr/errors/invalid_options.rb
 - lib/motr/errors/motr_error.rb
 - lib/motr/forms/base.rb
@@ -125,6 +137,7 @@ files:
 - lib/motr/rails.rb
 - lib/motr/version.rb
 - lib/motr.rb
+- config/en.yml
 - MIT-LICENSE
 - Rakefile
 - Gemfile
@@ -143,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1045787232198311107
+      hash: 2716753183944900755
       segments: 
       - 0
       version: "0"