hobo 0.6 → 0.6.1

data/hobo_files/plugin/tags/rapid_editing.dryml

@@ -8,7 +8,7 @@
       has_many_editor(attributes)
     end
   else
-    attrs = add_classes(attributes, "#{type_and_field}", "#{type_name}", "editor")
+    attrs = add_classes(attributes, "#{type_and_field}", "#{type_id}", "editor")
     call_polymorphic_tag("editor", attrs) or
       raise HoboError.new("<editor> not implemented for #{this.class.name}\##{this_field} " +
                             "(#{this.inspect}:#{this_type})")
@@ -86,10 +86,9 @@
                             this_type.primary_key_name => Hobo.raw_js('this.value')
                           } })
     %>
-    <select onchange="<%= f %>">
+    <select onchange="#{f}">
       <%= options_for_select(select_options.sort, this ? this.id : "") %>
-    </select>
-    <a if="&this">View</a>
+    </select>&nbsp;<a if="&this">View</a>
   </span>
 </def>
 
@@ -173,7 +172,7 @@
       <tagbody/>
     </if>
     <else>
-      <%= options_for_select(base_class.send(:subclasses).omap{[name.titleize, name]}, this.class.name) %>
+      <%= options_for_select(base_class.send(:subclasses).map{|x| [x.name.titleize, x.name]}, this.class.name) %>
     </else>
   </select>
 </def>

data/hobo_files/plugin/tags/rapid_forms.dryml

@@ -47,9 +47,9 @@
   body = [http_method_hidden, hiddens, body].join
    
   if web_method
-    add_classes!(html_attrs, "#{type_name}_#{web_method}_form")
+    add_classes!(html_attrs, "#{type_id}_#{web_method}_form")
   else
-    add_classes!(html_attrs, "#{'new_' if new_record}#{type_name}")
+    add_classes!(html_attrs, "#{'new_' if new_record}#{type_id}")
   end
    
   content_tag("form", body, html_attrs)
@@ -69,7 +69,7 @@
         has_many_input(attributes)
       end
     else
-      attrs = {}.update(attributes)
+      attrs = add_classes(attributes, "#{type_and_field}", "#{type_id}")
       attrs[:name] ||= param_name_for_this
       the_input = call_polymorphic_tag('input', attrs) or
         raise HoboError, ("No input tag for #{this_field}:#{this_type} (this=#{this.inspect})")
@@ -207,7 +207,7 @@
           }
   select_options.insert(0, ["(No #{this_type.name.to_s.titleize})", ""]) if this.nil? || include_none
   %>
-  <select name="<%= param_name_for_this(true) %>">
+  <select name="#{param_name_for_this(true)}">
     <%= options_for_select(select_options.sort, this ? this.id : "") %>
   </select>
 </def>
@@ -229,8 +229,8 @@
 
 
 <def tag="sti_type_input">
-  <select name="<%= param_name_for(form_this, form_field_path + ['type']) %>">
-    <%= options_for_select(this.class.send(:subclasses).omap{[name.titleize, name]}, this.class.name) %>
+  <select name="#{param_name_for(form_this, form_field_path + ['type'])}">
+    <%= options_for_select(this.class.send(:subclasses).map{|x| [x.name.titleize, x.name]}, this.class.name) %>
   </select>
 </def>
 

data/hobo_files/plugin/tags/rapid_navigation.dryml

@@ -40,11 +40,13 @@
 <!--- Pagination Navigation -->
 
 <def tag="page_nav" attrs="params">
-  <page_n_of_count/> - 
-  <first_page_link params="&params">|&lt;</first_page_link>
-  <previous_page_link params="&params">Previous</previous_page_link>
-  <next_page_link params="&params">Next</next_page_link>
-  <last_page_link params="&params">&gt|</last_page_link>
+  <if test="&@pages.length > 1">
+    <page_n_of_count/> - 
+    <first_page_link params="&params">|&lt;</first_page_link>
+    <previous_page_link params="&params">Previous</previous_page_link>
+    <next_page_link params="&params">Next</next_page_link>
+    <last_page_link params="&params">&gt|</last_page_link>
+  </if>
 </def>
 
 

data/hobo_files/plugin/tags/rapid_pages.dryml

@@ -49,6 +49,7 @@
 <def tag="PageForIndex"><Page merge/></def>
 <def tag="PageForNew"><Page merge/></def>
 <def tag="PageForShow"><Page merge/></def>
+<def tag="PageForEdit"><Page merge/></def>
 <def tag="PageForNewInCollection"><Page merge/></def>
 <def tag="PageForShowCollection"><Page merge/></def>
 
@@ -83,11 +84,11 @@
 
 
 <def tag="NewPage">
-  <PageForNew title="New #{human_type}" merge>
+  <PageForNew title="New #{type_name}" merge>
     <body class="rapid_generic_page"/>
     <main>
       <header>
-        <heading>New <human_type/></heading>
+        <heading>New <type_name title/></heading>
       </header>
 
       <panel param="main" class="main">
@@ -115,8 +116,8 @@
     <body class="rapid_generic_page"/>
     <main>
       <header>
-        <heading><human_type/><if test="&this.respond_to? :name">: <editor:name/></if></heading>
-        <p><delete_button in_place="&false"/></p>
+        <heading><type_name/><if test="&this.respond_to? :name">: <editor:name/></if></heading>
+        <delete_button in_place="&false"/>
       </header>
 
       <panel param="main_panel">
@@ -125,23 +126,56 @@
           <FieldList skip="name" tag="editor" param/>
         </section>
 
+        <nav param="new_links">
+          <UL with="&has_many_assocs">
+            <li><a action="new"/></li>
+          </UL>
+        </nav>
+      </panel>
+    </main>
+  </PageForShow>
+</def>
+
+
+<def tag="EditPage">
+  <% has_many_assocs = this.class.reflections.values.map do |refl|
+       this.send(refl.name) if Hobo.simple_has_many_association?(refl)
+     end.compact
+  %>
+  <PageForEdit merge>    
+    <body class="rapid_generic_page"/>
+    <main>
+      <header>
+        <heading><type_name/><if test="&this.respond_to? :name">: <name/></if></heading>
+        <delete_button in_place="&false"/>
+      </header>
+
+      <panel param="main_panel">
+        <header param="main_header"><h2>Details</h2></header>
+        <section>
+          <form>
+            <FieldList skip="name" tag="input" param/>
+            <submit label="Save"/>
+          </form>
+        </section>
+          
         <section param="new_links">
-          <repeat with="&has_many_assocs">
-            <p><a action="new"/></p>
-          </repeat>
+          <UL with="&has_many_assocs">
+            <li><a action="new"/></li>
+          </UL>
         </section>
       </panel>
     </main>
-  </PageForShow>
+  </PageForEdit>
 </def>
 
 
 <def tag="NewInCollectionPage">
-  <PageForNewInCollection title="New #{human_type}" merge>
+  <PageForNewInCollection title="New #{type_name}" merge>
     <body class="rapid_generic_page"/>
     <main>
       <header>
-        <h1>New <human_type/></h1>
+        <h1>New <type_name/></h1>
         <h2>For: <a with="&@owner" /></h2>
       </header>
 
@@ -203,6 +237,78 @@
   </PageForShowCollection>
 </def>
 
+
+<def tag="LoginPage" attrs="remember_me">
+  <Page title="Login">
+    <main>
+      <h1>Log In</h1>
+
+      <panel>
+        <section>
+          <form action="&request.request_uri">
+            <table class="login_table">
+              <tr>
+                <td class="field_label"><label for="login">Login</label></td>
+                <td><input type="text" name="login" id="login"/></td>
+              </tr>
+
+              <tr>
+                <td class="field_label"><label for="password">Password</label></td>
+                <td><input type="password" name="password" id="password"/></td>
+              </tr>
+
+              <tr if="&remember_me">
+                <td class="field_label"><label for="remember_me">Remember me:</label></td>
+                <td><input type="checkbox" name="remember_me" id="remember_me"/></td>
+              </tr>
+            </table>
+
+            <p><submit label='Log in'/></p>
+          </form>
+        </section>
+      </panel>
+    </main>
+  </Page>
+</def>
+
+
+<def tag="SignupPage">
+  <Page title="Sign Up">
+
+    <main>
+      <h1>Sign Up</h1>
+
+      <panel>
+        <section>
+          <error_messages/>
+          <form action="&request.request_uri">
+            <table class="signup_table">
+              <tr>
+                <td class="field_label"><label for="login">Login</label></td>
+                <td><input type="text" name="user[login]"/></td>
+              </tr>
+
+              <tr>
+                <td class="field_label"><label for="password">Password</label></td>
+                <td><input type="password" name="user[password]"/></td>
+              </tr>
+
+              <tr>
+                <td class="field_label"><label for="password">Confirm Password</label></td>
+                <td><input type="password" name="user[password_confirmation]"/></td>
+              </tr>
+            </table>
+
+            <p><submit label='Sign Up'/></p>
+          </form>
+        </section>
+      </panel>
+    </main>
+
+  </Page>
+</def>
+
+
 <def tag="doctype" attrs="version"><%=
   case version.upcase
     when "HTML 4.01 STRICT"

data/hobo_files/plugin/tags/rapid_support.dryml

@@ -21,3 +21,26 @@
   field_names.each do |field| %><with field="&field"><tagbody/></with><% end
 %></def>
 
+<def tag="with_field_names" attrs="fields, skip, skip_associations, include_timestamps"><%
+  field_names = if fields.nil?
+                  columns = this.content_columns.every(:name)
+                  columns -= %w{created_at updated_at created_on updated_on} unless include_timestamps
+
+                  if skip_associations == "has_many"
+                    assocs = this.reflections.values.reject {|r| r.macro == :has_many }.every(:name)
+                    columns - assocs
+                  elsif skip_associations
+                    columns
+                  else
+                    assocs = this.reflections.values.every(:name)
+                    columns + assocs
+                  end
+                else
+                  comma_split(fields)
+                end
+
+  field_names -= comma_split(skip) if skip
+%>
+  <repeat with="&field_names"><tagbody/></repeat>
+</def>
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: hobo
 version: !ruby/object:Gem::Version 
-  version: "0.6"
-date: 2007-08-22 00:00:00 +01:00
+  version: 0.6.1
+date: 2007-08-25 00:00:00 +01:00
 summary: The web app builder for Rails
 require_paths: 
 - lib
@@ -47,6 +47,7 @@ files:
 - 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
@@ -59,9 +60,7 @@ files:
 - 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/login.dryml
 - hobo_files/plugin/generators/hobo_front_controller/templates/search.dryml
-- hobo_files/plugin/generators/hobo_front_controller/templates/signup.dryml
 - 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
@@ -121,6 +120,13 @@ files:
 - 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/application.css
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default/views/application.dryml
+- 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_model/hobo_user_model_generator.rb
 - hobo_files/plugin/generators/hobo_user_model/templates
 - hobo_files/plugin/generators/hobo_user_model/USAGE
@@ -152,8 +158,8 @@ files:
 - hobo_files/plugin/lib/hobo/hobo_helper.rb
 - hobo_files/plugin/lib/hobo/html_string.rb
 - hobo_files/plugin/lib/hobo/lazy_hash.rb
-- hobo_files/plugin/lib/hobo/mapping_tags.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
@@ -168,8 +174,10 @@ 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_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

data/hobo_files/plugin/generators/hobo_front_controller/templates/login.dryml

@@ -1,42 +0,0 @@
-<Page title="<%= app_name %>">
-
-  <main>
-    <h1 class="front_page_title"><%= app_name %></h1>
-
-    <panel>
-      <h2>Login to <%= app_name %></h2>
-      <section>
-        <%% form_tag do %>
-        <table class="login_table">
-          <tr>
-            <td class="field_label"><label for="login">Username</label></td>
-            <td><%%= text_field_tag 'login' %></td>
-          </tr>
-
-          <tr>
-            <td class="field_label"><label for="password">Password</label></td>
-            <td><%%= password_field_tag 'password' %></td>
-          </tr>
-
-          <!-- Uncomment if required. You will also need to
-               add "before_filter :login_from_cookie" to ApplicationController
-               <tr>
-                 <td class="field_label"><label for="remember_me">Remember me:</label></td>
-                 <td><%%= check_box_tag 'remember_me' %></td>
-               </tr>
-               -->
-        </table>
-
-        <p><submit label='Log in'/></p>
-        <%% end %>
-      </section>
-    </panel>
-
-    <panel>
-      <div style="padding: 5px; text-align: center; font-style: italic;">
-        Edit app/views/<%= full_class_path %>/login.dryml to customise this page
-      </div>
-    </panel>
-  </main>
-
-</Page>

data/hobo_files/plugin/generators/hobo_front_controller/templates/signup.dryml

@@ -1,43 +0,0 @@
-<Page title="<%= app_name %>">
-
-  <main>
-    <h1 class="front_page_title"><%= app_name %></h1>
-
-    <panel>
-      <h2>Sign Up</h2>
-      <section>
-        <%%= error_messages_for :user %>
-
-        <%% form_for :user do |f| %>
-        <table class="login_table">
-          <tr>
-            <td class="field_label"><label for="login">Login</label></td>
-            <td><%%= f.text_field 'login' %></td>
-          </tr>
-
-          <tr>
-            <td class="field_label"><label for="password">Password</label></td>
-            <td><%%= f.password_field 'password' %></td>
-          </tr>
-
-          <tr>
-            <td class="field_label"><label for="password">Confirm Password</label></td>
-            <td><%%= f.password_field 'password_confirmation' %></td>
-          </tr>
-
-        </table>
-
-        <p><submit label='Sign Up'/></p>
-        <%% end %>
-      </section>
-    </panel>
-
-    <panel>
-      <div style="padding: 5px; text-align: center; font-style: italic;">
-        Edit app/views/<%= full_class_path %>/signup.dryml to customise this page
-      </div>
-    </panel>
-  </main>
-
-</Page>
-

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

@@ -1,262 +0,0 @@
-module Hobo
-  module MappingTags
-  
-    class InvalidMappingError < RuntimeError; end
-     
-    class TagOrSelector
-      
-      def initialize(name, all_mappings)
-        @_name = name
-        @_dot_names = []
-        @_selectors = []
-        
-        # Keep a reference to the set of mappings for the whole
-        # mapping_tags do ... end, so we can remove self if it turns out
-        # to be an AttributeValueSelector
-        @all_mappings = all_mappings
-      end
-      
-      attr_accessor :_name, :_selectors, :_dot_names
-     
-      def method_missing(name)
-        raise NoMethodError.new("undefined method: #{name}") if name.to_s =~ /^_|[!?=]$/
-        _dot_names << name
-        self
-      end
-      
-      
-      def [](*selectors)
-        raise InvalidMappingError.new unless _selectors.empty?
-        
-        @_selectors = selectors.omap {_to_selector}
-        self
-      end
-      
-      
-      def _to_selector
-        raise InvalidMappingError.new unless _dot_names.empty? and _selectors.empty?
-        AttributeSelector.new(_name)
-      end
-      
-      
-      def ==(rhs)
-        raise InvalidMappingError.new unless _selectors.empty? and _dot_names.empty?
-        AttributeValueSelector.new(_name, rhs)
-      end
-      
-      
-      def >>(rhs)
-        @all_mappings << Mapping.new(self, rhs)
-        nil
-      end
-      
-    end
-     
-    class AttributeSelector
-      
-      def initialize(attribute)
-        @attribute = attribute
-      end
-      
-      
-      def compile
-        "options[:#{@attribute}]"
-      end
-    end
-     
-    class AttributeValueSelector
-      
-      def initialize(name, value)
-        @name = name
-        @value = value
-      end
-      
-      attr_reader :name, :value
-      
-      def compile
-        "(options[:#{@name}] == #{@value.inspect})"
-      end
-      
-      def _to_selector
-        self
-      end
-      
-    end
-     
-     
-    class Mapping
-      
-      def initialize(pattern, result)
-        raise InvalidMappingError.new unless result._selectors.empty? and pattern._dot_names.length <= 1
-        @pattern = pattern
-        @result = result
-      end
-      
-      attr_reader :pattern, :result
-      
-      
-      def pattern_tag_name
-        pattern._name
-      end
-      
-      
-      def pattern_predicate
-        clauses = (pattern._selectors || []).omap{compile}
-        type_name = pattern._dot_names.first
-        clauses << "selector_type && (#{type_name.to_s.camelize} <= selector_type)" if type_name
-        !clauses.empty? && "proc {|options| #{clauses.join(' and ')}}"
-      end
-      
-      
-      def result_tag_name
-        result._name
-      end
-      
-      
-      def result_css_classes
-        result._dot_names
-      end
-      
-      
-    end
-     
-     
-    class MappingDSL
-     
-      def initialize
-        @_mappings = []
-      end
-      
-      attr_reader :_mappings
-
-      def standard_mappings
-        instance_eval do
-          intro   >> div.intro
-          maincol >> div.maincol
-          sidecol >> div.sidecol
-          panel   >> div.panel
-          section >> div.section.foo
-          
-          fields >> table.fields
-          field  >> tr.field
-          fl     >> td.field_label
-          fd     >> td.field_data  
-        end
-      end
-      
-      def method_missing(name, &b)
-        raise NoMethodError.new("undefined method: #{name}") if name.to_s =~ /^_|[!?=]$/
-        TagOrSelector.new(name, @_mappings)
-      end
-      
-    end
-     
-    (Object.instance_methods +
-     Object.private_instance_methods +
-     Object.protected_instance_methods).each do |m|
-      MappingDSL.send(:undef_method, m) unless
-        %w{initialize method_missing instance_eval standard_mappings}.include?(m) || m.starts_with?('_')
-    end
-     
-     
-    def self.define_mapping_tag(mapping, mod)
-      def_name           = mapping.pattern_tag_name
-      pred               = mapping.pattern_predicate
-      result_tag_name    = mapping.result_tag_name
-      result_css_classes = mapping.result_css_classes
-      
-      static_tag_name = result_tag_name if result_tag_name.to_s.in?(Hobo.static_tags)
-        
-      if def_name == result_tag_name
-        result_tag_name = "#{def_name}_unmapped"
-        if def_name.to_s.in?(mod.instance_methods) and result_tag_name.not_in?(mod.instance_methods)
-          mod.send(:alias_method, result_tag_name, def_name) 
-        end
-        
-        if pred and !mod.predicate_has_default?(def_name)
-          # Make sure the old tag method is called when the predicate is false
-          mod.module_eval "defp(:#{def_name}) { |options, block| #{result_tag_name}(options, &block) }"
-        end
-      end
-      
-      # puts "map: #{def_name}[#{pred}] -> #{result_tag_name} (#{result_css_classes * ' '}) #{static_tag_name}"
-      
-      def_line = if !pred.blank?
-                   "defp :#{def_name}, (#{pred}) do |options, block|"
-                 elsif mod.predicate_method?(def_name)
-                   # be sure not to overwrite the predicate dispatch method
-                   "defp :#{def_name} do |options, block|"
-                 else
-                   "def #{def_name}(options={}, &block)"
-                 end
-      
-      add_classes = if result_css_classes.empty?
-                      ""
-                    else
-                      "options = add_classes(options, *#{result_css_classes.inspect})"
-                    end
-      
-      no_method_fallback = if static_tag_name
-                             "content_tag('#{static_tag_name}', tagbody && tagbody.call, options)"
-                           else
-                             "raise NoMethodError.new('undefined method: #{result_tag_name}')"
-                           end
-      
-      mod.module_eval(x = <<-END, __FILE__, __LINE__+1)
-        #{def_line}
-          _tag_context(options, block) do |tagbody|
-            #{add_classes}
-            if respond_to?('#{result_tag_name}')
-              #{result_tag_name}(options, &block)
-            else
-              #{no_method_fallback}
-            end
-          end
-        end
-      END
-    end
-    
-    
-    def self.make_mappings(&b)
-      d = MappingDSL.new
-      d.instance_eval(&b)
-      d._mappings
-    end
-     
-
-    def self.map(&b)
-      @mappings = make_mappings(&b)
-    end
-    
-    
-    def self.apply_mappings(mod)
-      mod.send(:include, PredicateDispatch) unless PredicateDispatch.in?(mod.included_modules)
-      @mappings.each {|m| define_mapping_tag(m, mod) }
-    end
-    
-    
-    def self.apply_standard_mappings(mod)
-      mod.send(:include, PredicateDispatch) unless PredicateDispatch.in?(mod.included_modules)      
-      standard_mappings = make_mappings do
-        intro   >> div.intro
-        main    >> div.main
-        maincol >> div.maincol
-        sidecol >> div.sidecol
-        panel   >> div.panel
-        section >> div.section
-        
-        fields >> table.fields
-        field  >> tr.field
-        fl     >> td.field_label
-        fd     >> td.field_data  
-      end
-                                     
-      for mapping in standard_mappings
-        define_mapping_tag(mapping, mod) unless mapping.pattern_tag_name.to_s.in?(mod.instance_methods)
-      end
-
-    end
-  
-  end
-  
-end