hobo 0.6.2 → 0.6.3

data/hobo_files/plugin/tags/rapid_plus.dryml

@@ -5,13 +5,14 @@
       <div class="search">
         <form param="search_form" method="get" action="">
           <hidden_fields for_query_string skip="page, search_form"/>
-          Search <input class="search_field" type="text" name="search" value="&params[:search]"/>
+          Search 
+          <input class="search_field" type="search" name="search" value="&params[:search]"/>
+          <submit label="Go" class="search_button" param="search_submit"/>
         </form>
       </div>
     </div>
 
-    <Table merge_attrs="&attributes & (attrs_for(:Table) + attrs_for(:with_fields))"
-           merge_params>
+    <Table merge_attrs="&attributes & (attrs_for(:Table) + attrs_for(:with_fields))" merge_params>
       <field_heading_row>
         <with_field_names merge_attrs="&all_attributes & attrs_for(:with_fields)">
           <% col = sort_columns[scope.field_path] || scope.field_path
@@ -19,8 +20,9 @@
                       "-#{col}" : col
              sort_url = url_for(params.merge(:sort => sort) - [:page]) %>
                           
-          <th>
-            <a href="&sort_url" param="#{scope.field_name}_heading"><%= scope.field_name.titleize %></a>
+          <th param="#{scope.field_name}_heading">
+            <a href="&sort_url" class="column_sort" 
+               param="#{scope.field_name}_heading_link"><%= scope.field_name.titleize %></a>
             <if test="&col == sort_field">
               <do param="up_arrow" if="&sort_direction == 'desc'">&uarr;</do>
               <do param="down_arrow" if="&sort_direction == 'asc'">&darr;</do>
@@ -35,7 +37,7 @@
     </else>
    
     <nav class="page">
-      <page_nav/>
+      <page_nav param/>
     </nav>
   </div>
 </def>

data/hobo_files/plugin/tags/rapid_support.dryml

@@ -7,7 +7,7 @@
 
                   if skip_associations == "has_many"
                     assocs = this.class.reflections.values.reject {|r| r.macro == :has_many }.every(:name)
-                    columns - assocs
+                    columns + assocs
                   elsif skip_associations
                     columns
                   else
@@ -17,7 +17,6 @@
                 else
                   comma_split(fields)
                 end
-
   field_names -= comma_split(skip) if skip
   field_names = field_names.select {|f| can_view?(this, f)}
   field_names.each do |field| %><with field="&field"><tagbody/></with><% end
@@ -31,7 +30,7 @@
 
                   if skip_associations == "has_many"
                     assocs = this.reflections.values.reject {|r| r.macro == :has_many }.every(:name)
-                    columns - assocs
+                    columns + assocs
                   elsif skip_associations
                     columns
                   else

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: hobo
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
-date: 2007-09-13 00:00:00 +01:00
+  version: 0.6.3
+date: 2007-11-13 00:00:00 +00:00
 summary: The web app builder for Rails
 require_paths: 
 - lib
@@ -32,50 +32,40 @@ files:
 - hobo_files/plugin
 - hobo_files/plugin/CHANGES.txt
 - hobo_files/plugin/generators
-- hobo_files/plugin/init.rb
-- hobo_files/plugin/lib
-- hobo_files/plugin/LICENSE.txt
-- hobo_files/plugin/Rakefile
-- hobo_files/plugin/README
-- hobo_files/plugin/tags
-- hobo_files/plugin/tasks
-- hobo_files/plugin/uninstall.rb
 - hobo_files/plugin/generators/hobo
-- hobo_files/plugin/generators/hobo_front_controller
-- hobo_files/plugin/generators/hobo_migration
-- hobo_files/plugin/generators/hobo_model
-- hobo_files/plugin/generators/hobo_model_controller
-- hobo_files/plugin/generators/hobo_rapid
-- hobo_files/plugin/generators/hobo_user_controller
-- hobo_files/plugin/generators/hobo_user_model
 - hobo_files/plugin/generators/hobo/hobo_generator.rb
 - hobo_files/plugin/generators/hobo/templates
 - hobo_files/plugin/generators/hobo/templates/application.dryml
 - hobo_files/plugin/generators/hobo/templates/guest.rb
+- hobo_files/plugin/generators/hobo_front_controller
 - hobo_files/plugin/generators/hobo_front_controller/hobo_front_controller_generator.rb
 - hobo_files/plugin/generators/hobo_front_controller/templates
-- hobo_files/plugin/generators/hobo_front_controller/USAGE
 - hobo_files/plugin/generators/hobo_front_controller/templates/controller.rb
 - hobo_files/plugin/generators/hobo_front_controller/templates/functional_test.rb
 - hobo_files/plugin/generators/hobo_front_controller/templates/helper.rb
 - hobo_files/plugin/generators/hobo_front_controller/templates/index.dryml
 - hobo_files/plugin/generators/hobo_front_controller/templates/search.dryml
+- hobo_files/plugin/generators/hobo_front_controller/USAGE
+- hobo_files/plugin/generators/hobo_migration
 - hobo_files/plugin/generators/hobo_migration/hobo_migration_generator.rb
 - hobo_files/plugin/generators/hobo_migration/templates
 - hobo_files/plugin/generators/hobo_migration/templates/migration.rb
+- hobo_files/plugin/generators/hobo_model
 - hobo_files/plugin/generators/hobo_model/hobo_model_generator.rb
 - hobo_files/plugin/generators/hobo_model/templates
-- hobo_files/plugin/generators/hobo_model/USAGE
 - hobo_files/plugin/generators/hobo_model/templates/fixtures.yml
 - hobo_files/plugin/generators/hobo_model/templates/model.rb
 - hobo_files/plugin/generators/hobo_model/templates/unit_test.rb
+- hobo_files/plugin/generators/hobo_model/USAGE
+- hobo_files/plugin/generators/hobo_model_controller
 - hobo_files/plugin/generators/hobo_model_controller/hobo_model_controller_generator.rb
 - hobo_files/plugin/generators/hobo_model_controller/templates
-- hobo_files/plugin/generators/hobo_model_controller/USAGE
 - hobo_files/plugin/generators/hobo_model_controller/templates/controller.rb
 - hobo_files/plugin/generators/hobo_model_controller/templates/functional_test.rb
 - hobo_files/plugin/generators/hobo_model_controller/templates/helper.rb
 - hobo_files/plugin/generators/hobo_model_controller/templates/view.rhtml
+- hobo_files/plugin/generators/hobo_model_controller/USAGE
+- hobo_files/plugin/generators/hobo_rapid
 - hobo_files/plugin/generators/hobo_rapid/hobo_rapid_generator.rb
 - hobo_files/plugin/generators/hobo_rapid/templates
 - hobo_files/plugin/generators/hobo_rapid/templates/hobo_base.css
@@ -85,9 +75,7 @@ files:
 - hobo_files/plugin/generators/hobo_rapid/templates/themes
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public
-- hobo_files/plugin/generators/hobo_rapid/templates/themes/default/views
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/images
-- hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/stylesheets
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/images/banner.gif
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/images/bkg_bodytop.gif
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/images/bkg_corner_01.gif
@@ -118,55 +106,68 @@ files:
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/images/window_shadow_left.gif
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/images/window_shadow_right.gif
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/images/window_shadow_top.gif
+- hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/stylesheets
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/stylesheets/application.css
+- hobo_files/plugin/generators/hobo_rapid/templates/themes/default/views
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default/views/application.dryml
+- hobo_files/plugin/generators/hobo_user_controller
 - hobo_files/plugin/generators/hobo_user_controller/hobo_user_controller_generator.rb
 - hobo_files/plugin/generators/hobo_user_controller/templates
-- hobo_files/plugin/generators/hobo_user_controller/USAGE
 - hobo_files/plugin/generators/hobo_user_controller/templates/controller.rb
 - hobo_files/plugin/generators/hobo_user_controller/templates/functional_test.rb
 - hobo_files/plugin/generators/hobo_user_controller/templates/helper.rb
 - hobo_files/plugin/generators/hobo_user_controller/templates/view.rhtml
+- hobo_files/plugin/generators/hobo_user_controller/USAGE
+- hobo_files/plugin/generators/hobo_user_model
 - hobo_files/plugin/generators/hobo_user_model/hobo_user_model_generator.rb
 - hobo_files/plugin/generators/hobo_user_model/templates
-- hobo_files/plugin/generators/hobo_user_model/USAGE
 - hobo_files/plugin/generators/hobo_user_model/templates/fixtures.yml
 - hobo_files/plugin/generators/hobo_user_model/templates/model.rb
 - hobo_files/plugin/generators/hobo_user_model/templates/unit_test.rb
+- hobo_files/plugin/generators/hobo_user_model/USAGE
+- hobo_files/plugin/init.rb
+- hobo_files/plugin/lib
 - hobo_files/plugin/lib/action_view_extensions
-- hobo_files/plugin/lib/active_record
-- hobo_files/plugin/lib/extensions
-- hobo_files/plugin/lib/extensions.rb
-- hobo_files/plugin/lib/hobo
-- hobo_files/plugin/lib/hobo.rb
-- hobo_files/plugin/lib/rexml.rb
 - hobo_files/plugin/lib/action_view_extensions/base.rb
+- hobo_files/plugin/lib/active_record
 - hobo_files/plugin/lib/active_record/has_many_association.rb
 - hobo_files/plugin/lib/active_record/has_many_through_association.rb
 - hobo_files/plugin/lib/active_record/table_definition.rb
+- hobo_files/plugin/lib/extensions
 - hobo_files/plugin/lib/extensions/test_case.rb
-- hobo_files/plugin/lib/hobo/authenticated_user.rb
+- hobo_files/plugin/lib/extensions.rb
+- hobo_files/plugin/lib/hobo
 - hobo_files/plugin/lib/hobo/authentication_support.rb
 - hobo_files/plugin/lib/hobo/composite_model.rb
 - hobo_files/plugin/lib/hobo/controller.rb
-- hobo_files/plugin/lib/hobo/define_tags.rb
 - hobo_files/plugin/lib/hobo/dryml
+- hobo_files/plugin/lib/hobo/dryml/dryml_builder.rb
+- hobo_files/plugin/lib/hobo/dryml/part_context.rb
+- hobo_files/plugin/lib/hobo/dryml/scoped_variables.rb
+- hobo_files/plugin/lib/hobo/dryml/tag_module.rb
+- hobo_files/plugin/lib/hobo/dryml/taglib.rb
+- hobo_files/plugin/lib/hobo/dryml/template.rb
+- hobo_files/plugin/lib/hobo/dryml/template_environment.rb
+- hobo_files/plugin/lib/hobo/dryml/template_handler.rb
 - hobo_files/plugin/lib/hobo/dryml.rb
 - hobo_files/plugin/lib/hobo/email_address.rb
+- hobo_files/plugin/lib/hobo/enum_string.rb
+- hobo_files/plugin/lib/hobo/field_declaration_dsl.rb
 - hobo_files/plugin/lib/hobo/field_spec.rb
 - hobo_files/plugin/lib/hobo/generator.rb
 - hobo_files/plugin/lib/hobo/guest.rb
 - hobo_files/plugin/lib/hobo/hobo_helper.rb
 - hobo_files/plugin/lib/hobo/html_string.rb
-- hobo_files/plugin/lib/hobo/http_parameters.rb
 - hobo_files/plugin/lib/hobo/lazy_hash.rb
 - hobo_files/plugin/lib/hobo/markdown_string.rb
 - hobo_files/plugin/lib/hobo/migrations.rb
 - hobo_files/plugin/lib/hobo/model.rb
 - hobo_files/plugin/lib/hobo/model_controller.rb
 - hobo_files/plugin/lib/hobo/model_queries.rb
+- hobo_files/plugin/lib/hobo/model_router.rb
 - hobo_files/plugin/lib/hobo/model_support.rb
 - hobo_files/plugin/lib/hobo/password_string.rb
+- hobo_files/plugin/lib/hobo/percentage.rb
 - hobo_files/plugin/lib/hobo/plugins.rb
 - hobo_files/plugin/lib/hobo/predicate_dispatch.rb
 - hobo_files/plugin/lib/hobo/proc_binding.rb
@@ -176,16 +177,15 @@ files:
 - hobo_files/plugin/lib/hobo/textile_string.rb
 - hobo_files/plugin/lib/hobo/undefined.rb
 - hobo_files/plugin/lib/hobo/undefined_access_error.rb
+- hobo_files/plugin/lib/hobo/user.rb
 - hobo_files/plugin/lib/hobo/user_controller.rb
 - hobo_files/plugin/lib/hobo/where_fragment.rb
-- hobo_files/plugin/lib/hobo/dryml/dryml_builder.rb
-- hobo_files/plugin/lib/hobo/dryml/part_context.rb
-- hobo_files/plugin/lib/hobo/dryml/scoped_variables.rb
-- hobo_files/plugin/lib/hobo/dryml/tag_module.rb
-- hobo_files/plugin/lib/hobo/dryml/taglib.rb
-- hobo_files/plugin/lib/hobo/dryml/template.rb
-- hobo_files/plugin/lib/hobo/dryml/template_environment.rb
-- hobo_files/plugin/lib/hobo/dryml/template_handler.rb
+- hobo_files/plugin/lib/hobo.rb
+- hobo_files/plugin/lib/rexml.rb
+- hobo_files/plugin/LICENSE.txt
+- hobo_files/plugin/Rakefile
+- hobo_files/plugin/README
+- hobo_files/plugin/tags
 - hobo_files/plugin/tags/core.dryml
 - hobo_files/plugin/tags/rapid.dryml
 - hobo_files/plugin/tags/rapid_document_tags.dryml
@@ -195,9 +195,11 @@ files:
 - hobo_files/plugin/tags/rapid_pages.dryml
 - hobo_files/plugin/tags/rapid_plus.dryml
 - hobo_files/plugin/tags/rapid_support.dryml
+- hobo_files/plugin/tasks
 - hobo_files/plugin/tasks/dump_fixtures.rake
 - hobo_files/plugin/tasks/environments.rake
 - hobo_files/plugin/tasks/hobo_tasks.rake
+- hobo_files/plugin/uninstall.rb
 - bin/hobo
 - LICENSE.txt
 - README.txt

data/hobo_files/plugin/lib/hobo/define_tags.rb

@@ -1,56 +0,0 @@
-module Hobo
-
-  module DefineTags
-    
-    def self.included(base)
-      base.extend(ClassMethods)
-      base.extend(PredicateDispatch::ClassMethods)
-    end
-
-    module ClassMethods
-      
-      attr_reader :hobo_tag_blocks
-
-      
-      def def_tag(name, *attrs_and_pred, &tagdef_block)
-        pred, attrs = if attrs_and_pred.first.is_a? Proc
-                        [attrs_and_pred.first, attrs_and_pred[1..-1]]
-                      else
-                        [nil, attrs_and_pred]
-                      end
-
-        name = name.to_s
-        @hobo_tag_blocks ||= HashWithIndifferentAccess.new
-        @hobo_tag_blocks[name] = tagdef_block
-        @hobo_tag_blocks["#{name}_predicate"] = pred if pred
-
-        safe_name = Dryml.unreserve(name)
-        locals = attrs.map{|a| Hobo::Dryml.unreserve(a)} + %w{options inner_tag_options}
-        
-        def_line = if pred
-                     "defp :#{safe_name}, @hobo_tag_blocks['#{name}_predicate'] do |options, block|"
-                   elsif predicate_method?(safe_name)
-                     # be sure not to overwrite the predicate dispatch method
-                     "defp :#{safe_name} do |options, block|"
-                   else
-                     "def #{safe_name}(options={}, &block)"
-                   end
-
-        class_eval(<<-END, __FILE__, __LINE__+1)
-          #{def_line}
-            _tag_context(options, block) do |tagbody|
-              locals = _tag_locals(options, #{attrs.inspect})
-              locals_hash = { :tagbody => tagbody };
-              #{locals.inspect}.each_with_index{|a, i| locals_hash[a] = locals[i]}
-              Hobo::ProcBinding.new(self, locals_hash).instance_eval(&#{self.name}.hobo_tag_blocks['#{name}'])
-            end
-          end
-        END
-        
-      end
-    
-    end
-
-  end
-  
-end

data/hobo_files/plugin/lib/hobo/http_parameters.rb

@@ -1,225 +0,0 @@
-module Hobo
-  
-  module HttpParameters
-    
-    class PermissionDeniedError < RuntimeError; end
-    class InvalidError < RuntimeError; end
-    
-    def initialize_record(record, params)
-      update_without_tracking(record, params)
-      record.set_creator(current_user)
-      (@to_create ||= []) << record
-      record
-    end
-
-    
-    def update_record(record, params)
-      return if params.blank?
-      
-      original = record.duplicate
-      # 'duplicate' can set these, but they can
-      # conflict with the changes so we clear them
-      @this.send(:clear_aggregation_cache)
-      @this.send(:clear_association_cache)
-      
-      (@to_update ||= []) << [original, record]
-
-      update_without_tracking(record, params)
-    end
-    
-    
-    def update_without_tracking(record, params)
-      params && params.each_pair do |field_name, value|
-        field = if (create = field_name =~ /^\+/)
-                  field_name[1..-1].to_sym
-                else
-                  field_name.to_sym
-                end
-        refl = record.class.reflections[field]
-        
-        if refl._?.macro == :belongs_to
-          if create
-            new_for_belongs_to(record, refl, value)
-          else
-            update_belongs_to(record, refl, value)
-          end
-          
-        elsif Hobo.simple_has_many_association?(refl)
-          raise HoboError, "invalid HTTP parameter #{field_name}" if create
-          update_has_many(record, refl, value)
-          
-        else
-          raise HoboError, "invalid HTTP parameter #{field_name}" if create
-          update_primitive(record, field, value)
-          
-        end
-      end
-    end
-    
-    
-    def new_for_belongs_to(record, refl, fields)
-      # person[+home][address]=blah  Create new home and set address (PUT POST)
-
-      target = refl.klass.new
-      initialize_record(target, fields)
-      record.send("#{refl.name}=", target)
-    end
-    
-    
-    def update_belongs_to(record, refl, value)
-      if value.is_a? String
-        # Update belongs_to to reference some existing record
-
-        target = if value.starts_with?('@')
-                   # person[home]=@home_12  Reference different existing home (PUT POST)
-                   
-                   Hobo.object_from_dom_id(value[1..-1])
-                 elsif refl.klass.id_name?
-                   # product[category]=garden  Reference existing category with id or name (PUT POST)
-                   
-                   refl.klass.find_by_id_name(value)
-                 else
-                   raise HoboError, "invalid HTTP parameter" if create
-                 end
-        record.send("#{refl.name}=", target)
-        
-      else
-        # Update state of current belongs_to target
-        # person[home][address]=blah  Update existing home.address (PUT)
-        raise HoboError, "invalid HTTP parameter" unless params[:action] == "update"
-        
-        target = record.send(refl.name)
-        raise HoboError, "invalid HTTP parameter" if target.nil?
-        update_record(target, value)
-      end
-    end
-    
-    
-    def update_has_many(record, refl, items)
-      new_items, changed_items = items.partition_hash {|k,v| k =~ /^\+/}
-      
-      new_items.keys.sort_by{|k|k.to_i}.each do |k|
-        # home[people][+1][name]=blah Create new Person with fkey refing to this home and set name (PUT POST)
-        fields = new_items[k]
-        new_for_has_many(record, refl, fields)
-      end
-      
-      changed_items.each_pair do |id, value|
-        # Change to existing record - only valid on PUTs
-        raise HoboError, "invalid HTTP parameter" unless params[:action] == "update"
-        
-        target = id =~ /_/ ? Hobo.object_from_dom_id(id) : refl.klass.find(id)
-        # Ensure the target is actually in this has_many
-        raise HoboError, "invalid http parameter" unless target.send(refl.primary_key_name) == record.id
-        
-        if value.is_a?(String) && value.downcase == "delete"
-          # home[people][45]=delete  Delete Person[45] (PUT)
-          delete_record(target)
-          
-        else
-          # home[people][45][name]=blah  Update Person[45].name (PUT)
-          raise HoboError, "invalid http parameter" unless value.is_a?(Hash) # field/value pairs
-          update_record(target, value)
-          
-        end
-      end
-    end
-    
-    
-    def new_for_has_many(record, refl, value)
-      # home[people][+1][name]=blah Create new Person with fkey refing to this home and set name (PUT POST)
-
-      new_record = record.send(refl.name).new
-      initialize_record(new_record, value)
-      record.send("#{refl.name}").target << new_record
-    end
-    
-    
-    def delete_record(record)
-      raise HoboError, "invalid HTTP parameter" unless params[:action] == "update"
-      (@to_delete ||= []) << record
-    end
-    
-    
-    def update_primitive(record, field, value)
-      # person[name]=fred (POST PUT)
-      field_type = record.class.field_type(field)
-      record.send("#{field}=", param_to_value(field_type, value))
-    end
-    
-    
-    def parse_datetime(s)
-      defined?(Chronic) ? Chronic.parse(s) : Time.parse(s)
-    end
-
-
-    def param_to_value(field_type, value)
-      if field_type.nil?
-        value
-      elsif field_type <= Date
-        if value.is_a? Hash
-          Date.new(*(%w{year month day}.map{|s| value[s].to_i}))
-        elsif value.is_a? String
-          dt = parse_datetime(value)
-          dt && dt.to_date
-        end
-      elsif field_type <= Time
-        if value.is_a? Hash
-          Time.local(*(%w{year month day hour minute}.map{|s| value[s].to_i}))
-        elsif value.is_a? String
-          parse_datetime(value)
-        end
-      elsif field_type <= TrueClass
-        (value.is_a?(String) && value.strip.downcase.in?(['0', 'false']) || value.blank?) ? false : true
-      else
-        # primitive field
-        value
-      end
-    end
-    
-    
-    def check_permissions_and_apply_changes
-      valid = true
-      for old, new in @to_update
-        raise PermissionDeniedError unless Hobo.can_update?(current_user, old, new)
-        new_valid = new.save
-        valid &&= new_valid
-      end if @to_update
-      
-      for record in @to_create
-        raise PermissionDeniedError unless Hobo.can_create?(current_user, record)
-        # check if it's new because it might have already been saved as a result of the updates
-        record_valid = record.save if record.new_record?
-        valid &&= record_valid
-      end if @to_create
-
-      for record in @to_delete
-        raise PermissionDeniedError unless Hobo.can_delete?(current_user, record)
-        record.destroy
-      end if @to_delete
-      
-      valid
-    ensure
-      @to_update = @to_create = @to_delete = nil
-    end
-    
-    
-    def secure_change_transaction
-      valid = nil
-      begin
-        ActiveRecord::Base.transaction do
-          yield 
-          valid = check_permissions_and_apply_changes
-          raise InvalidError unless valid
-        end
-      rescue PermissionDeniedError
-        return :not_allowed
-      rescue InvalidError
-        return :invalid
-      end
-      :valid
-    end
-    
-  end
-
-end