hobo 0.9.0 → 0.9.100

data/taglibs/rapid_editing.dryml

@@ -28,7 +28,8 @@ This area of Hobo has had less attention that the non-ajax forms of late, so it'
 
 <!-- Not implemented - you just get links to the items in the collection -->
 <def tag="has-many-editor">
-  <% #TODO: Implement %>
+  <% #TODO: Implement 
+  %>
   <a merge-attrs/>
 </def>
   
@@ -36,30 +37,33 @@ This area of Hobo has had less attention that the non-ajax forms of late, so it'
 <def tag="belongs-to-editor" polymorphic><%= select_one_editor(attributes) %></def>
 
 <!-- Provides a simple Scriptaculous in-place-editor that uses an `<input type='text'>` -->
-<def tag="editor" for="string"><%= in_place_editor attributes %></def>
+<def tag="editor" for="string"><%= in_place_editor(attributes, this) %></def>
 
 <!-- Provides a simple Scriptaculous in-place-editor that uses a `<textarea>` -->
-<def tag="editor" for="text"><%= in_place_editor attributes %></def>
+<def tag="editor" for="text"><%= in_place_editor(attributes, this) %></def>
   
 <!-- Provides a simple Scriptaculous in-place-editor that uses a `<textarea>`.
   A JavaScript hook is available in order to replace the simple textarea with a rich-text editor.
-  For an example, see the [hoboyui](http://github.com/tablatom/hoboyui) plugin -->
-<def tag="editor" for="html"><%= in_place_editor attributes %></def>
+  For an example, see the [hoboyui](http://github.com/tablatom/hoboyui) plugin
+
+This tag does not sanitize HTML; this is provided by HtmlString before saving to the database.
+ -->
+<def tag="editor" for="html"><%= in_place_editor(attributes, this) %></def>
 
 <!-- Provides a simple Scriptaculous in-place-editor that uses an `<input type='text'>` -->
-<def tag="editor" for="datetime"><%= in_place_editor attributes %></def>
+<def tag="editor" for="datetime"><%= in_place_editor(attributes, this) %></def>
 
 <!-- Provides a simple Scriptaculous in-place-editor that uses an `<input type='text'>` -->
-<def tag="editor" for="date"><%= in_place_editor attributes %></def>
+<def tag="editor" for="date"><%= in_place_editor(attributes, this) %></def>
 
 <!-- Provides a simple Scriptaculous in-place-editor that uses an `<input type='integer'>` -->
-<def tag="editor" for="integer"><%= in_place_editor attributes %></def>
+<def tag="editor" for="integer"><%= in_place_editor(attributes, this) %></def>
 
 <!-- Provides a simple Scriptaculous in-place-editor that uses an `<input type='BigDecimal'>` -->
-<def tag="editor" for="BigDecimal"><%= in_place_editor attributes %></def>
+<def tag="editor" for="BigDecimal"><%= in_place_editor(attributes, this) %></def>
 
 <!-- Provides a simple Scriptaculous in-place-editor that uses an `<input type='text'>` -->
-<def tag="editor" for="float"><%= in_place_editor attributes %></def>
+<def tag="editor" for="float"><%= in_place_editor(attributes, this) %></def>
 
 <!-- Raises an error - passwords cannot be edited in place -->
 <def tag="editor" for="password"><% raise HoboError, "passwords cannot be edited in place" %></def>

data/taglibs/rapid_forms.dryml

@@ -417,8 +417,9 @@ The menus default to the current time if the current value is nil.
    -->
 <def tag="input" for="HoboFields::EnumString" attrs="labels, titleize, first-option, first-value"><%
   labels ||= {}
+  labels = HashWithIndifferentAccess.new(labels)
   titleize = true if titleize.nil?
-  options = this_type.values.map {|v| [labels.fetch(v.to_sym, titleize ? v.titleize : v), v] }
+  options = this_type.values.map {|v| [labels.fetch(v, titleize ? this_type.translated_values[v].titleize : this_type.translated_values[v]), v] }
   %>
   <select name="#{param_name_for_this}" merge-attrs>
     <option value="#{first_value}" unless="&first_option.nil?"><first-option/></option>
@@ -680,7 +681,7 @@ Here's a more complex example.  This used to be a part of [agility](http://cookb
       end
     end
 
-Note that this was added to the projects controller, rather than the users controller as in the first example.  You can read this as: create an auto-complete action called �new_member_name� that finds users that are not already members of the project, and not the owner of the project, and completes the :name field.
+Note that this was added to the projects controller, rather than the users controller as in the first example.  You can read this as: create an auto-complete action called `new_member_name` that finds users that are not already members of the project, and not the owner of the project, and completes the :name field.
 
     <name-one:user complete-target="&@project" completer="new_member_name"/>
 
@@ -853,7 +854,8 @@ Use the `uri` option to specify a redirect location:
   end
   -%>
   <ul class="check-many" param="default" merge-attrs>
-    <input type="hidden" name="#{param_name}[]" value=""/><% # ensure all items are removed when nothing checked %>
+    <input type="hidden" name="#{param_name}[]" value=""/><% # ensure all items are removed when nothing checked 
+    %>
     <li repeat="&options" param>
       <input type="checkbox" name="#{param_name}[]" value="@#{this.id}" checked="&this.in?(collection)" disabled="&disabled"/>
       <name param/>
@@ -891,12 +893,13 @@ The body of the tag will be repeated for each of the current records in the coll
   -->
 <def tag="input-many" attrs="fields,skip" polymorphic>
   <set empty="&this.empty?"/>
+  <% skip ||= this.proxy_reflection.klass.reflect_on_all_associations.detect {|p| p.primary_key_name==this.proxy_reflection.primary_key_name}.try.name.to_s if this.respond_to? :proxy_reflection %>           
   <ul class="input-many #{this_field.dasherize} #{css_data :input_many_prefix, param_name_for_this}">
     <li repeat class="#{'record-with-errors' unless this.errors.empty?}">
       <error-messages without-heading class="sub-record"/>
       <hidden-id-field/>
       <div class="input-many-item" param="default">
-        <field-list merge-attrs="fields" />
+        <field-list merge-attrs="fields" skip="&skip"/>
       </div>
       <div class="buttons">
         <button type="button" class="remove-item" merge-attrs="disabled" param="remove-item">-</button>
@@ -904,7 +907,6 @@ The body of the tag will be repeated for each of the current records in the coll
       </div>
     </li>
     <li if="&empty">
-      <% skip ||= this.proxy_reflection.klass.reflect_on_all_associations.detect {|p| p.primary_key_name==this.proxy_reflection.primary_key_name}.try.name.to_s %>           
       <fake-field-context fake-field="0" context="&this.try.new_candidate || this.member_class.new">
         <div class="input-many-item" param="default">
           <field-list merge-attrs="fields" skip="&skip"/>

data/taglibs/rapid_generics.dryml

@@ -19,7 +19,7 @@
   -->
 <def tag="empty-collection-message">
   <div class="empty-collection-message" style="#{'display:none' if !this.empty?}" param="default">
-    <ht key="#{type_name.downcase.sub(' ', '_').pluralize}.collection.empty_message">
+    <ht key="#{this.member_class.name.tableize}.collection.empty_message">
       No <collection-name lowercase/> to display
     </ht>
   </div>

data/taglibs/rapid_lifecycles.dryml

@@ -20,11 +20,12 @@ All of the [standard ajax attributes](/api_taglibs/rapid_forms) are also support
 
     html_attributes[:method] ||= has_params ? :get : :put
     add_classes!(html_attributes, "transition-button #{transition_name}-button")
-    label ||= transition_name.to_s.titleize
+    label = ht("#{this.class.name.tableize}.actions.#{transition_name}", :default => (label || transition_name.to_s.titleize))
     url = object_url(this, transition_name, :method => html_attributes[:method])
 
     if (update || !ajax_attributes.empty?) && !has_params
       ajax_attributes[:message] ||= label
+      ajax_attributes[:method] = html_attributes[:method]
       func = ajax_updater(url, update, ajax_attributes)
       html_attributes.update(:onclick => "var e = this; " + func, :type =>'button', :value => label)
       element(:input, html_attributes, nil, true, true)
@@ -41,7 +42,7 @@ For example, you could use this on a `Friendship` card: the person invited to ha
   -->  
 <def tag="transition-buttons">
   <div merge-attrs class="transitions">
-    <% this.lifecycle.available_transitions_for(current_user).each do |t| %>
+    <% this.lifecycle.publishable_transitions_for(current_user).each do |t| %>
       <transition-button transition="&t"/>
     <% end %>
   </div>

data/taglibs/rapid_pages.dryml

@@ -245,7 +245,7 @@ The flash is output in a `<div class="flash notice">`, where `notice` is the `ty
 <def tag="flash-messages" attrs="names"><%=
   scope.flash_rendered = true
   names = names.nil? ? flash.keys : comma_split(names)
-  names.map { |name| flash_message :type => name }
+  names.map { |name| flash_message :type => name }.join
 %></def>
 
 <!-- Renders `<div id="ajax-progress"><div><span id="ajax-progress-text"></span></div></div>`. The theme will style this as an ajax progress 'spinner' -->

data/taglibs/rapid_support.dryml

@@ -93,7 +93,7 @@ This tag is in need of a review - it's a bit funky.
       scope.field_name = n == "this" ? this.member_class.try.name : n.to_s.gsub("." , "_") 
       scope.field_path = n
       parameters.default
-    end
+    end.join
   end
 %>
 </def>

data/tasks/hobo_tasks.rake

@@ -44,5 +44,15 @@ namespace :hobo do
     END
   end
 
+  desc "Run the standard generators that the hobo command runs with the --invite-only option."
+  task :run_invite_only_generators do
+    exec <<-END
+      ruby script/generate hobo --add-routes && \
+      ruby script/generate hobo_rapid --import-tags --invite-only && \
+      ruby script/generate hobo_user_model user --invite-only && \
+      ruby script/generate hobo_user_controller user --invite-only && \
+      ruby script/generate hobo_front_controller front --delete-index --add-routes --invite-only 
+    END
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.100
 platform: ruby
 authors: 
 - Tom Locke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 +00:00
+date: 2009-12-01 00:00:00 +00:00
 default_executable: hobo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,14 +23,14 @@ dependencies:
         version: 2.2.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mislav-will_paginate
+  name: will_paginate
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.1
+        version: 2.3.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: hobosupport
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.0
+        version: 0.9.100
     version: 
 - !ruby/object:Gem::Dependency 
   name: hobofields
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.0
+        version: 0.9.100
     version: 
 description: 
 email: tom@tomlocke.com
@@ -82,7 +82,6 @@ files:
 - lib/hobo.rb
 - lib/hobo/accessible_associations.rb
 - lib/hobo/authentication_support.rb
-- lib/hobo/bundle.rb
 - lib/hobo/controller.rb
 - lib/hobo/dev_controller.rb
 - lib/hobo/dryml.rb
@@ -131,6 +130,7 @@ files:
 - lib/hobo/scopes/named_scope_extensions.rb
 - lib/hobo/static_tags
 - lib/hobo/tasks/rails.rb
+- lib/hobo/translations.rb
 - lib/hobo/undefined.rb
 - lib/hobo/undefined_access_error.rb
 - lib/hobo/user.rb

data/lib/hobo/bundle.rb

@@ -1,330 +0,0 @@
-module ::Hobo
-
-  class Bundle
-
-    @bundles = HashWithIndifferentAccess.new
-
-    class << self
-
-      # Hobo::Bundle.bundles is a hash of all instantiated bundles by name
-      attr_accessor :bundles
-
-      # Used by subclasses, e.g MyBundle.plugin is the name of the
-      # plugin the bundle came from
-      attr_reader :plugin
-
-      attr_reader :model_declarations, :controller_declarations
-
-      attr_accessor :dirname
-
-      def inherited(base)
-        filename = caller[0].match(/^(.*):\d+/)[1]
-        base.dirname = filename.match(%r(^.*/plugins/[^/]+))[0]
-      end
-
-
-      def load_models_and_controllers
-        return if models_and_controllers_loaded?
-
-        @plugin = File.basename(dirname)
-
-        @model_declarations      = []
-        @controller_declarations = []
-
-        class_eval do
-          eval_ruby_files("#{dirname}/models", @models)
-          eval_ruby_files("#{dirname}/controllers", @controllers)
-        end
-      end
-
-      def [](bundle_name)
-        bundles[bundle_name]
-      end
-
-
-      private
-
-      def bundle_model(name, &block)
-        @model_declarations << [name, block]
-      end
-
-
-      def bundle_model_controller(model_name, &block)
-        @controller_declarations << [model_name, block]
-      end
-
-
-      def models_and_controllers_loaded?
-        @model_declarations
-      end
-
-
-
-      def eval_ruby_files(dir, filenames)
-        files = if filenames == [:none]
-                  []
-                elsif filenames.blank? || filenames == [:all]
-                  Dir["#{dir}/*.rb"]
-                else
-                  filenames.map { |f| "#{dir}/#{f}.rb" }
-                end
-
-        files.each { |f| instance_eval(File.read(f), f, 1) }
-      end
-
-
-      # Declarations
-
-      def models(*models)
-        @models = models
-      end
-
-      def controllers(*controllers)
-        @controllers = controllers.map {|c| case c.to_s
-                                              when /controller$/, "all", "none" then c
-                                              else "#{c.to_s.pluralize}_controller"
-                                            end }
-      end
-
-    end
-
-    def initialize(*args)
-      caller_options = args.extract_options!
-
-      self.class.load_models_and_controllers
-      self.name = args.first || self.class.name.match(/[^:]+$/)[0].underscore
-      Bundle.bundles[name] = self
-
-      options = defaults(caller_options).with_indifferent_access
-      options.recursive_update(caller_options)
-
-      @renames, @options = separate_renames(options)
-
-      includes
-
-      create_models
-      create_controllers
-
-      init
-    end
-
-    attr_accessor :renames, :options, :name
-
-    # optionally overridden by the bundle subclass
-    def includes; end
-    def init;     end
-    def defaults(options); {}; end
-
-
-    def plugin
-      self.class.plugin
-    end
-
-
-    def create_models
-      self.class.model_declarations.each do |name, block|
-        klass = make_class(new_name_for(name), ActiveRecord::Base)
-
-        klass.meta_def :belongs_to_with_optional_polymorphism do |*args|
-          opts = args.extract_options!
-
-          if opts[:polymorphic] == :optional
-            if bundle.options["polymorphic_#{name}"]
-              opts[:polymorphic] = true
-              opts.delete(:class_name)
-            else
-              opts.delete(:polymorphic)
-            end
-          end
-          belongs_to_without_optional_polymorphism(name, opts)
-        end
-        klass.meta_eval { alias_method_chain :belongs_to, :optional_polymorphism }
-
-        klass.class_eval { hobo_model }
-
-        # FIXME this extension breaks passing a block to belongs_to
-        klass.meta_def :belongs_to_with_alias do |*args|
-          opts = args.extract_options!
-          name = args.first.to_sym
-
-          alias_name = opts.delete(:alias)
-
-          belongs_to_without_alias(name, opts)
-
-          if alias_name && name != alias_name
-            klass.send(:alias_method, alias_name, name)
-            # make the aliased name available in the classes metadata
-            klass.reflections[alias_name] = klass.reflections[name]
-          end
-
-        end
-        klass.meta_eval { alias_method_chain :belongs_to, :alias }
-
-        klass.class_eval(&block)
-      end
-    end
-
-
-    def create_controllers
-      bundle = self
-      self.class.controller_declarations.each do |model_name, block|
-        klass = make_class("#{new_name_for(model_name).to_s.pluralize}Controller", ::ApplicationController) do
-          hobo_model_controller
-        end
-        klass.class_eval(&block)
-      end
-    end
-
-
-    def make_class(name, base_class, &b)
-      bundle = self
-      klass = Class.new(base_class) do
-        # Nasty hack because blocks can't take blocks
-        # Roll on Ruby 1.9
-        def self.feature(name, &block)
-          _feature(name, block)
-        end
-
-        def method_missing(name, *args)
-          if name.to_s =~ /^_.*_$/
-            self.class.bundle.magic_option(name)
-          else
-            super
-          end
-        end
-      end
-
-      klass.meta_def(:bundle) do
-        bundle
-      end
-
-      klass.meta_def(:_feature) do |feature, block|
-        has_feature = bundle.options[feature]
-        if has_feature
-          define_method("features_#{feature}?") { true }
-          meta_def("features_#{feature}?") { true }
-          block.call if block
-        else
-          define_method("features_#{feature}?") { false }
-          meta_def("features_#{feature}?") { false }
-        end
-      end
-      silence_warnings { Object.const_set(name, klass) }
-
-      klass.meta_def :method_missing do |name, *args|
-        if name.to_s =~ /^_.*_$/
-          bundle.magic_option(name)
-        else
-          super
-        end
-      end
-
-      klass.class_eval(&b) if b
-
-      klass
-    end
-
-
-    def new_name_for(name)
-      name = name.to_s
-      underscore = name =~ /^[a-z]/
-      name = name.camelize if underscore
-
-      plural = !renames.has_key?(name) && (sing = name.singularize) && renames.has_key?(sing)
-      name = sing if plural
-
-      # Keep a track of names we've seen to avoid cycles
-      seen = [ name ]
-
-      name = name.gsub(/_.*?_/) { |s| new_name_for(s[1..-2]) }
-      while (newname = renames[name])
-        name = newname
-        name = name.gsub(/_.*?_/) { |s| new_name_for(s[1..-2]) }
-
-        break if name.in?(seen)
-        seen << name
-      end
-
-      name = name.underscore if underscore
-      name = name.pluralize  if plural
-      name = name.to_sym if underscore || plural
-      name
-    end
-
-
-    def separate_renames(options)
-      simple_options, renames = HashWithIndifferentAccess.new, HashWithIndifferentAccess.new
-      options.each do |k, v|
-        if k.to_s =~ /^[A-Z]/
-          renames[k] = v.to_s
-        else
-          simple_options[k] = v
-        end
-      end
-      [renames, simple_options]
-    end
-
-
-    def customize(name, &block)
-      new_name_for(name).to_s.constantize.class_eval(&block)
-    end
-
-
-    def method_missing(name, *args)
-      if name.to_s =~ /^_.*_$/
-        magic_option(name)
-      else
-        super
-      end
-    end
-
-
-    # Returns the option value or renamed class name from a 'magic'
-    # name like _foo_ or _MyFoo_
-    def magic_option(name)
-      option_name = name.to_s[1..-2]
-      if option_name == "bundle"
-        self.name
-      elsif options.has_key?(option_name)
-        options[option_name]
-      else
-        new_name_for(option_name)
-      end
-    end
-
-
-    def optional_bundle(*args)
-      local_options = args.extract_options!
-      class_name, option_name = args
-      option_name ||= class_name.to_s.underscore
-      _include_bundle(class_name, option_name, local_options) if self.options[option_name]
-    end
-
-
-    def include_bundle(*args)
-      local_options = args.extract_options!
-      class_name, option_name = args
-      option_name ||= class_name.to_s.underscore
-      _include_bundle(class_name, option_name, local_options)
-    end
-
-
-    def _include_bundle(class_name, option_name, local_options)
-      external_options = self.options[option_name]
-      external_options = {} if external_options.nil? || external_options == true
-      name = "#{self.name}_#{option_name}"
-
-      sub_bundle_options = external_options.merge(local_options).merge(renames)
-      sub_bundle = class_name.to_s.constantize.new(name, sub_bundle_options)
-
-      conflicting_renames = (renames.keys & sub_bundle.renames.keys).select { |k| renames[k] != sub_bundle.renames[k] }
-      unless conflicting_renames.empty?
-        raise ArgumentError, "Conflicting renames in included bundle '#{name}' of '#{self.name}': #{conflicting_renames * ', '}"
-      end
-      renames.update(sub_bundle.renames)
-      self.options["#{option_name}_bundle"] = name
-    end
-
-  end
-
-end