hobo 0.8.3 → 0.8.4

data/dryml_generators/rapid/forms.dryml.erb

@@ -15,33 +15,31 @@ cancel_to_index_page = !cancel_to_index_page && linkable?(:index)
   </form>
 </def>
 
-<% if defined? model::Lifecycle -%>
-<% model::Lifecycle.creators.values.where.publishable?.each do |creator| -%>
-<def tag="<%= creator.name.dasherize %>-form" polymorphic/>
-<def tag="<%= creator.name.dasherize %>-form" for="<%= model.name %>">
+<% creators.each do |creator| -%>
+<def tag="<%= creator.name.to_s.dasherize %>-form" polymorphic/>
+<def tag="<%= creator.name.to_s.dasherize %>-form" for="<%= model.name %>">
   <form lifecycle="<%= creator.name %>">
     <error-messages param/>
     <field-list fields="<%= creator.parameters * ', ' %>" param/>
     <div param="actions">
-      <submit label="<%= creator.name.titleize %>" param/><or-cancel param="cancel"/>
+      <submit label="<%= creator.name.to_s.titleize %>" param/><or-cancel param="cancel"/>
     </div>
   </form>
 </def>
 <% end -%>
 
-<% model::Lifecycle.transitions.where.publishable?.each do |transition| -%>
-<def tag="<%= transition.name.dasherize %>-form" polymorphic/>
-<def tag="<%= transition.name.dasherize %>-form" for="<%= model.name %>">
+<% transitions.each do |transition| -%>
+<def tag="<%= transition.name.to_s.dasherize %>-form" polymorphic/>
+<def tag="<%= transition.name.to_s.dasherize %>-form" for="<%= model.name %>">
   <form lifecycle="<%= transition.name %>">
     <error-messages param/>
     <input type="hidden" name="key" value="&this.lifecycle.provided_key" if="&this.lifecycle.provided_key"/>
     <field-list fields="<%= transition.parameters * ', ' %>" param/>
     <div param="actions">
-      <submit label="<%= transition.name.titleize %>" param/><or-cancel param="cancel"/>
+      <submit label="<%= transition.name.to_s.titleize %>" param/><or-cancel param="cancel"/>
     </div>
   </form>
 </def>
 <% end -%>
-<% end # of if defined? model::Lifecycle -%>
 
 <% end # of each_model do -%>

data/dryml_generators/rapid/pages.dryml.erb

@@ -33,7 +33,7 @@ new_link = linkable?(:new)
       <section param="content-body">
 <% if new_link -%>
 
-        <a action="new" to="&model" merge-params/>      
+        <a action="new" to="&model" param="new-link"/>      
 <% end -%>
 
         <page-nav param="top-page-nav"/>
@@ -74,7 +74,10 @@ creator_link   = creator && model.reflections[creator] && linkable?(model.reflec
 edit_link      = linkable?(:edit)
 main_content   = model.primary_content_attribute
 show_fields    = standard_fields(:belongs_to).*.to_s - [model.name_attribute, main_content, creator, back_link, *boolean_fields].*.to_s
-collection     = model.dependent_collections.sort_by(&:to_s).first
+
+is_user_model = model < Hobo::User
+
+collection     = model.view_hints.primary_children
 if collection
   collection_class = model.reflections[collection].klass
   owner            = model.reverse_reflection(collection)._?.name
@@ -83,6 +86,8 @@ if collection
     add_form = !add_link && linkable?(collection_class, :"create_for_#{owner}", :method => :post)
   end
 end
+
+aside_collections = model.view_hints.secondary_children unless model.view_hints.secondary_children.empty?
 -%>
 <def tag="show-page" for="<%= model.name %>">
   <page merge title="<%= model_name :title %>">
@@ -90,60 +95,79 @@ end
     <body: class="show-page <%= model_class %>" param/>
 
     <content: param>
-      <header param="content-header">
+<% if aside_collections -%>
+      <section-group param="content-body">
+        <section param="main-content">
+<% end -%>
+          <header param="content-header">
 <% if  back_link -%>
-        <a:<%= back_link %> param="parent-link">&laquo; <name/></a>
+            <a:<%= back_link %> param="parent-link">&laquo; <name/></a>
 <% end -%>
-        <h2 param="heading"><name/></h2>
-<% if boolean_fields.any? -%>
+            <h2 param="heading"><name/></h2>
+<% if boolean_fields -%>
 
-        <field-names-where-true fields="<%= boolean_fields * ', ' %>" param/>
+            <field-names-where-true fields="<%= boolean_fields * ', ' %>" param/>
 <% end -%>
 <% if creator_link -%>
 
-        <a:<%= model.creator_attribute %> param="creator-link"/>
+            <a:<%= model.creator_attribute %> param="creator-link"/>
 <% elsif creator -%>        
 
-        <view:get-creator param="creator-name"/>
+            <view:get-creator param="creator-name"/>
 <% end -%>
 <% if edit_link -%>
 
-        <a action="edit" if="&can_edit?" param="edit-link">Edit <%= model_name :title %></a>
+            <a action="edit" if="&can_edit?" param="edit-link">Edit <%= model_name :title %></a>
 <% end -%>
-      </header>
+          </header>
     
-      <section param="content-body">
+          <section param="content-body"<%= ' with-flash-messages' if aside_collections %>>
 <% if main_content -%>
-        <view:<%= main_content %> param="primary-content"/>
+            <view:<%= main_content %> param="description"/>
 <% end -%>
 <% if show_fields.any? -%>
-        <field-list fields="<%= show_fields * ', ' %>" param/>
+            <field-list fields="<%= show_fields * ', ' %>" param/>
 <% end -%>
 <% if collection -%>
-        <section param="collection-section">
-          <h3 param="collection-heading"><%= collection.to_s.titleize %></h3>
+            <section param="collection-section">
+              <h3 param="collection-heading"><%= '<Your/>' if is_user_model %><%= collection.to_s.titleize %></h3>
               
 <% if sortable_collection?(collection) -%>
-          <sortable-collection:<%= collection %> param="collection"/>
+              <sortable-collection:<%= collection %> param="collection"/>
 <% else -%>
-          <collection:<%= collection %> param/>
+              <collection:<%= collection %> param/>
 <% end -%>
 <% if add_link -%>
 
-          <a:<%= collection %> action="new" if="&can_create?(@<%= model_name.underscore %>.<%= collection %>)" param="new-link">New <%= collection.to_s.singularize.titleize %></a>
+              <a:<%= collection %> action="new" if="&can_create?(@<%= model_name.underscore %>.<%= collection %>)" param="new-link">New <%= collection.to_s.singularize.titleize %></a>
 <% elsif add_form -%>
 
-          <section param="add-to-collection" if="&can_create?(@<%= model_name.underscore %>.<%= collection %>)">
-            <h3 param="add-form-heading">Add <%= a_or_an collection.to_s.singularize.titleize %></h3>
-            <form with="&@<%= collection_class.name.underscore %> || @<%= model_name.underscore %>.<%= collection %>.new" owner="<%= owner %>" method="post" without-cancel param>
-              <field-list: skip="<%= owner %>"/>
-              <submit: label="Add"/>
-            </form>
-          </section>
+              <section param="add-to-collection" if="&can_create?(@<%= model_name.underscore %>.<%= collection %>)">
+                <h3 param="add-form-heading">Add <%= a_or_an collection.to_s.singularize.titleize %></h3>
+                <form with="&@<%= collection_class.name.underscore %> || @<%= model_name.underscore %>.<%= collection %>.new_candidate" owner="<%= owner %>" without-cancel param>
+                  <field-list: skip="<%= owner %>"/>
+                  <submit: label="Add"/>
+                </form>
+              </section>
 <% end -%>
+            </section>
+<% end # of main collection -%>
+          </section>
+<% if aside_collections -%>
         </section>
+        
+        <aside param>
+<% for collection in aside_collections -%>
+          <preview-with-more:<%= collection %>.recent param="preview-<%= collection %>">
+<% if is_user_model -%>
+            <heading:><Your with="&@<%= model_name.underscore %>"/> <%= collection.to_s.titleize %></heading:>
+<% end -%>
+            <more:>more</more:>
+          </preview-with-more>
+<% end -%>
+        </aside>
+      </section-group>
 <% end -%>
-      </section>
     </content:>
     
   </page>
@@ -160,7 +184,7 @@ name_attribute = model.name_attribute
 
     <content:>
       <section param="content-header">
-        <h2 param="heading"><name/></h2>
+        <h2 param="heading">Edit <type-name/></h2>
         <delete-button label="Remove This <%= model_name :title %>" param/>
       </section>
 
@@ -179,6 +203,8 @@ owner_model     = model.reflections[owner].klass
 linkable_owner  = linkable?(owner_model, :show)
 owner_tag       = linkable_owner ? "a" : "name"
 
+owner_is_user = owner_model < Hobo::User
+
 owner = model.reflections[owner].macro == :has_many ? owner.to_s.singularize : owner.to_s
 -%>
 <% if :index.in? actions -%>
@@ -192,17 +218,22 @@ new_link = :new.in?(actions)
     
     <content: param>
       <header param="content-header">
-        <% if linkable_owner %><div param="back-to">Back to <a with="&@<%= owner %>"/></div><% end %>
+<% if linkable_owner -%>
+        <div param="back-to">Back to <a with="&@<%= owner %>"/></div>
+<% end -%>
+<% if owner_is_user %>
+        <h2 param="heading"><Your with="&current_user"/> <%= model_name :title, :plural %></h2>
+<% else -%>
         <h2 param="heading"><%= model_name :title, :plural %></h2>
         <h3 param="subheading">For: <<%= owner_tag %> with="&@<%= owner %>"/></h3>
-
+<% end -%>
         <p param="count" if>There <count prefix="are"/></p>
       </header>
       
       <section param="content-body">
 <% if new_link -%>
 
-        <a action="new" to="&model" merge-params/>      
+        <a action="new" to="&model" param="new-link"/>
 <% end -%>
 
         <page-nav param="top-page-nav"/>
@@ -227,7 +258,7 @@ new_link = :new.in?(actions)
     <content: param>
       <header param="content-header">
         <h2 param="heading">New <%= collection_name.singularize.titleize %></h2>
-        <h3 class="subheading" param>For: <<%= owner_tag %> with="&@<%= owner %>"/></h3>
+        <h3 param="subheading">For: <<%= owner_tag %> with="&@<%= owner %>"/></h3>
       </header>
       
       <section param="content-body">
@@ -243,8 +274,7 @@ new_link = :new.in?(actions)
 
 <% end # of owner_actions.each_pair -%>
 
-<% if defined? model::Lifecycle -%>
-<% model::Lifecycle.creators.values.where.publishable?.*.name.each do |creator| -%>
+<% creator_names.each do |creator| -%>
 <def tag="<%= creator.dasherize %>-page" polymorphic/>
 <def tag="<%= creator.dasherize %>-page" for="<%= model.name %>">
 
@@ -266,7 +296,7 @@ new_link = :new.in?(actions)
 </def>
 <% end -%>
 
-<% model::Lifecycle.transitions.where.publishable?.*.name.each do |transition| -%>
+<% transition_names.each do |transition| -%>
 <def tag="<%= transition.dasherize %>-page" polymorphic/>
 <def tag="<%= transition.dasherize %>-page" for="<%= model.name %>">
   <page title="<%= transition.titleize %>" merge>
@@ -287,6 +317,5 @@ new_link = :new.in?(actions)
 </def>
 
 <% end -%>
-<% end # of if defined? model::Lifecycle -%>
 
 <% end # of each_model do -%>

data/hobo.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Hobo-0.8.3
+# Gem::Specification for Hobo-0.8.4
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Tom Locke
 autorequire: 
 bindir: bin
 
-date: 2008-10-15 00:00:00 +01:00
+date: 2008-12-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,9 +21,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.3
+        version: 0.8.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: hobofields
@@ -31,9 +31,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.3
+        version: 0.8.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "2.1"
+        version: 2.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: mislav-will_paginate
@@ -68,12 +68,14 @@ extra_rdoc_files:
 - lib/active_record/association_proxy.rb
 - lib/active_record/association_reflection.rb
 - lib/extensions/test_case.rb
+- lib/hobo/accessible_associations.rb
 - lib/hobo/authentication_support.rb
 - lib/hobo/bundle.rb
 - lib/hobo/composite_model.rb
 - lib/hobo/controller.rb
 - lib/hobo/dev_controller.rb
 - lib/hobo/dryml/dryml_builder.rb
+- lib/hobo/dryml/dryml_doc.rb
 - lib/hobo/dryml/dryml_generator.rb
 - lib/hobo/dryml/dryml_support_controller.rb
 - lib/hobo/dryml/parser/attribute.rb
@@ -104,11 +106,12 @@ extra_rdoc_files:
 - lib/hobo/lifecycles/state.rb
 - lib/hobo/lifecycles/transition.rb
 - lib/hobo/lifecycles.rb
-- lib/hobo/mass_assignment.rb
 - lib/hobo/model.rb
 - lib/hobo/model_controller.rb
 - lib/hobo/model_router.rb
 - lib/hobo/model_support.rb
+- lib/hobo/permissions/associations.rb
+- lib/hobo/permissions.rb
 - lib/hobo/rapid_helper.rb
 - lib/hobo/scopes/apply_scopes.rb
 - lib/hobo/scopes/association_proxy_extensions.rb
@@ -120,12 +123,13 @@ extra_rdoc_files:
 - lib/hobo/undefined_access_error.rb
 - lib/hobo/user.rb
 - lib/hobo/user_controller.rb
+- lib/hobo/view_hints.rb
 - lib/hobo.rb
 - LICENSE.txt
 - README
 - tasks/environments.rake
 - tasks/fix_dryml.rake
-- tasks/generate_tag_reference.rb
+- tasks/generate_tag_reference.rake
 - tasks/hobo_tasks.rake
 files: 
 - bin/hobo
@@ -139,12 +143,14 @@ files:
 - lib/active_record/association_proxy.rb
 - lib/active_record/association_reflection.rb
 - lib/extensions/test_case.rb
+- lib/hobo/accessible_associations.rb
 - lib/hobo/authentication_support.rb
 - lib/hobo/bundle.rb
 - lib/hobo/composite_model.rb
 - lib/hobo/controller.rb
 - lib/hobo/dev_controller.rb
 - lib/hobo/dryml/dryml_builder.rb
+- lib/hobo/dryml/dryml_doc.rb
 - lib/hobo/dryml/dryml_generator.rb
 - lib/hobo/dryml/dryml_support_controller.rb
 - lib/hobo/dryml/parser/attribute.rb
@@ -175,11 +181,12 @@ files:
 - lib/hobo/lifecycles/state.rb
 - lib/hobo/lifecycles/transition.rb
 - lib/hobo/lifecycles.rb
-- lib/hobo/mass_assignment.rb
 - lib/hobo/model.rb
 - lib/hobo/model_controller.rb
 - lib/hobo/model_router.rb
 - lib/hobo/model_support.rb
+- lib/hobo/permissions/associations.rb
+- lib/hobo/permissions.rb
 - lib/hobo/rapid_helper.rb
 - lib/hobo/scopes/apply_scopes.rb
 - lib/hobo/scopes/association_proxy_extensions.rb
@@ -191,6 +198,7 @@ files:
 - lib/hobo/undefined_access_error.rb
 - lib/hobo/user.rb
 - lib/hobo/user_controller.rb
+- lib/hobo/view_hints.rb
 - lib/hobo.rb
 - LICENSE.txt
 - Manifest
@@ -200,7 +208,6 @@ files:
 - rails_generators/hobo/templates/dryml-support.js
 - rails_generators/hobo/templates/guest.rb
 - rails_generators/hobo/templates/initializer.rb
-- rails_generators/hobo/templates/patch_routing.rb
 - rails_generators/hobo_front_controller/hobo_front_controller_generator.rb
 - rails_generators/hobo_front_controller/templates/controller.rb
 - rails_generators/hobo_front_controller/templates/functional_test.rb
@@ -209,6 +216,7 @@ files:
 - rails_generators/hobo_front_controller/USAGE
 - rails_generators/hobo_model/hobo_model_generator.rb
 - rails_generators/hobo_model/templates/fixtures.yml
+- rails_generators/hobo_model/templates/hints.rb
 - rails_generators/hobo_model/templates/model.rb
 - rails_generators/hobo_model/templates/unit_test.rb
 - rails_generators/hobo_model/USAGE
@@ -257,6 +265,7 @@ files:
 - script/generate
 - taglibs/core.dryml
 - taglibs/rapid.dryml
+- taglibs/rapid_core.dryml
 - taglibs/rapid_document_tags.dryml
 - taglibs/rapid_editing.dryml
 - taglibs/rapid_forms.dryml
@@ -269,12 +278,15 @@ files:
 - taglibs/rapid_user_pages.dryml
 - tasks/environments.rake
 - tasks/fix_dryml.rake
-- tasks/generate_tag_reference.rb
+- tasks/generate_tag_reference.rake
 - tasks/hobo_tasks.rake
 - test/generators/test_generator_helper.rb
 - test/generators/test_helper.rb
 - test/generators/test_hobo_model_controller_generator.rb
-- uninstall.rb
+- test/permissions/models/models.rb
+- test/permissions/models/schema.rb
+- test/permissions/models/test.sqlite3
+- test/permissions/test_permissions.rb
 - hobo.gemspec
 has_rdoc: true
 homepage: http://hobocentral.net/
@@ -303,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 specification_version: 2
 summary: The web app builder for Rails
 test_files: 
@@ -311,3 +323,4 @@ test_files:
 - test/generators/test_generator_helper.rb
 - test/generators/test_helper.rb
 - test/generators/test_hobo_model_controller_generator.rb
+- test/permissions/test_permissions.rb

data/lib/active_record/association_collection.rb

@@ -10,20 +10,9 @@ module ActiveRecord
       end
 
 
-      def build_with_reverse_reflection(*args)
-        res = build_without_reverse_reflection(*args)
-        set_reverse_association(res) if hobo_association_collection?
-        res
-      end
-      alias_method_chain :build, :reverse_reflection
-
-
-      def new(attributes = {})
-        record = @reflection.klass.new(attributes)
-        if hobo_association_collection?
-          set_belongs_to_association_for(record)
-          set_reverse_association(record) unless proxy_reflection.options[:as]
-        end
+      def new_candidate(attributes = {})
+        record = new
+        @target.delete record
         record
       end
 
@@ -32,14 +21,6 @@ module ActiveRecord
         proxy_reflection.klass
       end
 
-
-      def proxy_respond_to_with_automatic_scopes?(method, include_priv = false)
-        proxy_respond_to_without_automatic_scopes?(method, include_priv) ||
-          (@reflection.klass.create_automatic_scope(method) if @reflection.klass.respond_to?(:create_automatic_scope))
-      end
-      alias_method_chain :proxy_respond_to?, :automatic_scopes
-
-
       private
 
         def set_reverse_association(object)