hobo 1.3.0.pre20 → 1.3.0.pre21

data/VERSION

@@ -1 +1 @@
-1.3.0.pre20
+1.3.0.pre21

data/lib/generators/hobo/setup_wizard/setup_wizard_generator.rb

@@ -151,7 +151,7 @@ EOI
                                    :invite_only => @invite_only,
                                    :activation_email => @activation_email,
                                    :admin_subsite_name => @admin_subsite_name
-
+      return unless @invite_only
       say "Installing admin subsite..."
       invoke 'hobo:admin_subsite', [@admin_subsite_name],
                                    :user_resource_name => @user_resource_name,

data/lib/generators/hobo/test_framework/test_framework_generator.rb

@@ -42,7 +42,7 @@ private
     end
 
     def setup_rspec
-      gem 'rspec-rails', '>= 2.0.0.beta.10', :group => :test
+      gem 'rspec-rails', '>= 2.0.0', :group => [:test, :development]
       @should_update = true
       return unless options[:update]
       @finalize_hooks << lambda {say "Finalizing rspec installation..."; invoke 'rspec:install'}

data/lib/hobo/controller/model.rb

@@ -590,7 +590,7 @@ module Hobo
 
     def update_response(in_place_edit_field=nil, options={}, &b)
 
-      flash_notice (ht(:"#{@this.class.name.to_s.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.model_name.human} were saved"])) if valid?
+      flash_notice (ht(:"#{@this.class.to_s.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.model_name.human} were saved"])) if valid?
 
       response_block(&b) or
         if valid?

data/lib/hobo/extensions/action_view/translation_helper.rb

@@ -1,18 +1,25 @@
 ActionView::Helpers::TranslationHelper.module_eval do
 
-  # we need to remove the <span> tag because it will mess up
-  # the dryml tags when ht is used in some place
-  # we redefine the method since we cannot catch the rescued exception
-  # although the only difference is the rescue block
-  def translate(key, options = {})
+  include Hobo::Helper::Translations::Normalizer
+
+  # simple wrapper around the translate helper
+  # it implements a dryml <translate> and a <t> tag
+  # Improved security: interpolated variables are escaped
+  # Improved management: when it returns a string it is always html_safe
+  # It assumes the base translation string is html_safe
+  # It removes the <span> tag when the key is missing, because it would mess up
+  # the dryml tags when ht or t is used in some place
+
+  def translate(key, options={})
+    key, options = normalize_args(key, options)
     translation = I18n.translate(scope_key_by_partial(key), options.merge!(:raise => true))
-    if html_safe_translation_key?(key) && translation.respond_to?(:html_safe)
+    if translation.respond_to?(:html_safe)
       translation.html_safe
     else
       translation
     end
   rescue I18n::MissingTranslationData => e
-    keys = I18n.normalize_keys(I18n.locale, key, options[:scope]).join('.')
+    keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope]).join('.')
     "[MISSING: #{keys}]"
   end
   alias_method :t, :translate

data/lib/hobo/helper/translations.rb

@@ -2,14 +2,7 @@ module Hobo
   module Helper
     module Translations
 
-      # simple wrapper around the translate helper
-      # it implements a dryml <translate> and a <t> tag
-
-      def translate(*args)
-        key, options = normalize_args(*args)
-        super key.to_sym, options
-      end
-      alias_method :t, :translate
+      include Normalizer
 
 =begin
 
@@ -46,7 +39,7 @@ en:
         model_name = keys.shift
         model_class = begin model_name.camelize.constantize; rescue; end
         unless model_class && model_class < ActiveRecord::Base
-          raise Hobo::I18nError, %(wrong model name: "#{model_name}" (extracted from translation key). You might want to use the translate/t tag/method instead.)
+          raise Hobo::I18nError, %(wrong model name: "#{model_name}" (extracted from translation key: "#{key}"). You might want to use the translate/t tag/method instead.)
         end
         options[:default].unshift("hobo.#{keys.join(".")}".to_sym)
         options[:model] = model_class.model_name.human(:count=>options[:count]||1)
@@ -54,22 +47,7 @@ en:
       end
       alias_method :ht, :hobo_translate
 
-    private
-
-      def normalize_args(key, options={})
-        if (key.class == Hash) # called as a tag
-          if key.has_key?(:default) && !key[:default].blank?
-            Rails.logger.warn "hobo-i18n: 'default' should not be used as an attribute on *translate tags. If used, then you need to make sure that the tags inner-contents are not used. These are normally treated as defaults automatically, but if there is a default attribute then that inner-content will be hidden from this method - and will not be replaced with the translation found."
-          end
-          defaults = options[:default]
-          options = key
-          key = options.delete(:key)
-          # Set options[:default] to complete the tag-argument-conversion process.
-          options[:default] = defaults.call(options) if defaults.class == Proc
-        end
-        options[:default] = Array.wrap options[:default]
-        [key, options]
-      end
+
 
     end
   end

data/lib/hobo/helper/translations/normalizer.rb

@@ -0,0 +1,39 @@
+require 'active_support/core_ext/string/output_safety'
+module Hobo
+  module Helper
+    module Translations
+      module Normalizer
+
+        private
+
+        def normalize_args(key, options={})
+          if (key.class == Hash) # called as a tag
+            if key.has_key?(:default) && !key[:default].blank?
+              Rails.logger.warn "hobo-i18n: 'default' should not be used as an attribute on *translate tags. If used, then you need to make sure that the tags inner-contents are not used. These are normally treated as defaults automatically, but if there is a default attribute then that inner-content will be hidden from this method - and will not be replaced with the translation found."
+            end
+            defaults = options[:default]
+            options = key
+            key = options.delete(:key)
+            # Set options[:default] to complete the tag-argument-conversion process.
+            options[:default] = defaults.call(options) if defaults.class == Proc
+          end
+          escape_options(options)
+          options[:default] = Array.wrap options[:default]
+          [key, options]
+        end
+
+        def escape_options(options)
+          options.each_pair do |k,v|
+            options[k] = case v
+                         when Array
+                            v.map {|i| i.respond_to?(:html_safe) ? ERB::Util.html_escape(i) : i}
+                         else
+                           v.respond_to?(:html_safe) ? ERB::Util.html_escape(v) : v
+                         end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/hobo/rapid/taglibs/rapid_forms.dryml

@@ -653,7 +653,7 @@ For situations where there are too many target records to practically include in
   -->
 <def tag="select-one" attrs="include-none, blank-message, options, sort, limit, text-method"><%
   raise Hobo::PermissionDeniedError.new("Not allowed to edit #{this_field}") if !attributes[:disabled] && !can_edit?
-  blank_message ||= ht("#{this_type.name.tableize}.message.no", :default=>"(No #{this_type.model_name.human})")
+  blank_message ||= ht("#{this_type.name.underscore}.message.no", :default=>"(No #{this_type.model_name.human})")
   limit ||= 100
 
   options ||= begin

data/lib/hobo/rapid/taglibs/rapid_navigation.dryml

@@ -89,7 +89,7 @@ This is a simple tag - just look at the source if you need to know more detail.
     <ul class="navigation account-nav" param>
       <li if="&Rails.env.development?" param="dev-user-changer"><dev-user-changer/></li>
       <if test="&logged_in?">
-        <li class='nav-item' param="logged-in-as"><a to="&current_user"><t key="hobo.actions.logged_in_as_html" name="&name">Logged in as <name/></t></a></li>
+        <li class='nav-item' param="logged-in-as"><a to="&current_user"><t key="hobo.actions.logged_in_as" name="&name">Logged in as <name/></t></a></li>
         <li class='nav-item' param="account"><a action="account"><t key="hobo.actions.account">Account</t></a></li>
         <li class='nav-item' param="log-out"><a href="&logout_url"><t key="hobo.actions.logout">Log out</t></a></li>
       </if>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  hash: -1637108442
+  hash: -1637108441
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  - pre20
-  version: 1.3.0.pre20
+  - pre21
+  version: 1.3.0.pre21
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 -04:00
+date: 2010-11-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108442
+        hash: -1637108441
         segments: 
         - 1
         - 3
         - 0
-        - pre20
-        version: 1.3.0.pre20
+        - pre21
+        version: 1.3.0.pre21
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108442
+        hash: -1637108441
         segments: 
         - 1
         - 3
         - 0
-        - pre20
-        version: 1.3.0.pre20
+        - pre21
+        version: 1.3.0.pre21
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,13 +93,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108442
+        hash: -1637108441
         segments: 
         - 1
         - 3
         - 0
-        - pre20
-        version: 1.3.0.pre20
+        - pre21
+        version: 1.3.0.pre21
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -278,6 +278,7 @@ files:
 - lib/hobo/extensions/i18n.rb
 - lib/hobo/helper.rb
 - lib/hobo/helper/translations.rb
+- lib/hobo/helper/translations/normalizer.rb
 - lib/hobo/model.rb
 - lib/hobo/model/accessible_associations.rb
 - lib/hobo/model/find_for.rb