hobo 1.0.0 → 1.0.1

data/CHANGES.txt

@@ -14,6 +14,15 @@ likely to cause conflicts, so it is highly recommended that you have
 your code backed up and in a change control system such as git or
 subversion.
 
+=== Hobo 1.0.1 ===
+
+This version contains two speedups: one fix that reduces the number of
+database accesses by Matt Jones and one that speeds up compilation of
+DRYML by Petteri Räty.
+
+This version also contains several bug fixes.  See the [github
+log](http://github.com/tablatom/hobo/tree/v1.0.1) for more details.
+
 === Hobo 1.0.0 ===
 
 Drumm-roll! Trumpets! Fanfare! 

data/bin/hobo

@@ -7,6 +7,11 @@ require 'rbconfig'
 
 RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
 
+if RUBY.empty?
+  puts "ruby not found"
+  exit 2
+end
+
 Signal.trap("INT") { puts; exit }
 
 hobo_src = File.join(File.dirname(__FILE__), "../hobo_files/plugin")
@@ -87,11 +92,17 @@ if run_rails
   opts = []
   if rails_version
     opts << "_#{rails_version}_"
-#  else
-#    if `rails -v`.split[1].split(".").slice(0,2)!=['2', '3']
-#      puts "Rails 2.3 required!"
-#      exit 2
-#    end
+  else
+    v=`#{RUBY} -S rails -v`.split[1].split(".")
+    unless v.length>=3
+      puts "rails not found!"
+      exit 2
+    end
+    unless v[0]=='2' && ['2', '3'].include?(v[1])
+      puts "Rails 2.2 or 2.3 required!"
+      puts "Rails 3 requires Hobo 1.1 or later."
+      exit 2
+    end
   end
   opts << "-d #{database_type}" if database_type
   system("#{RUBY} -S rails #{opts * ' '} #{app_path}")

data/dryml_generators/rapid/pages.dryml.erb

@@ -207,7 +207,7 @@ end
               </section>
 <%   end -%>
             </section>
-<% end # of main collection -%>
+<% end -%>
           </section>
 <% if aside_collections -%>
         </section>

data/lib/hobo.rb

@@ -16,7 +16,7 @@ class HoboError < RuntimeError; end
 
 module Hobo
 
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
   
   class PermissionDeniedError < RuntimeError; end
 

data/lib/hobo/controller.rb

@@ -133,12 +133,11 @@ module Hobo
       tag_renderer.send(name, options)
     end
     
-    NO_SEARCH_RESULTS_HTML = "<p>Your search returned no matches.</p>"
     def site_search(query)
       results_hash = Hobo.find_by_search(query)
       all_results = results_hash.values.flatten.select { |r| r.viewable_by?(current_user) }
       if all_results.empty?
-        render :text => NO_SEARCH_RESULTS_HTML
+        render :text => "<p>"+ ht(:"hobo.live_search.no_results", :default=>["Your search returned no matches."]) + "</p>"
       else
         # TODO: call one tag that renders all the search results with headings for each model
         render_tags(all_results, :search_card, :for_type => true)

data/lib/hobo/dryml/template.rb

@@ -72,7 +72,7 @@ module Hobo::Dryml
       # compile the build instructions
       @builder.build(local_names, auto_taglibs, mtime)
 
-      logger.info("  DRYML: Compiled #{template_path} in %.2fs" % (Time.now - now)) if parsed
+      logger.info("  DRYML: Compiled #{template_path} in #{'%.2fs' % (Time.now - now)}") if parsed
     end
 
 
@@ -319,9 +319,25 @@ module Hobo::Dryml
       res
     end
 
+    def self.descendents(el,&block)
+      return if el.elements.empty?
+      el.elements.each do |child|
+        block.call(child)
+        descendents(child,&block)
+      end
+    end
+
+    # Using REXML::XPath is slow
+    def self.descendent_select(el)
+      result = []
+      descendents(el) { |desc|
+        result << desc if yield(desc)
+      }
+      result
+    end
 
     def param_names_in_definition(el)
-      REXML::XPath.match(el, ".//*[@param]").map do |e|
+      self.class.descendent_select(el) { |el| el.attribute 'param' }.map do |e|
         name = get_param_name(e)
         dryml_exception("invalid param name: #{name.inspect}", e) unless
           is_code_attribute?(name) || name =~ RUBY_NAME_RX || name =~ /#\{/
@@ -486,7 +502,7 @@ module Hobo::Dryml
 
 
     def call_name(el)
-      dryml_exception("invalid tag name", el) unless el.dryml_name =~ /^#{DRYML_NAME}(\.#{DRYML_NAME})*$/
+      dryml_exception("invalid tag name (remember to use '-' rather than '_')", el) unless el.dryml_name =~ /^#{DRYML_NAME}(\.#{DRYML_NAME})*$/
       
       name = Hobo::Dryml.unreserve(ruby_name(el.dryml_name))
       if call_to_self_from_type_specific_def?(el)
@@ -777,7 +793,7 @@ module Hobo::Dryml
     def tag_attributes(el)
       attributes = el.attributes
       items = attributes.map do |n,v|
-        dryml_exception("invalid attribute name '#{n}'", el) unless n =~ DRYML_NAME_RX
+        dryml_exception("invalid attribute name '#{n}' (remember to use '-' rather than '_')", el) unless n =~ DRYML_NAME_RX
 
         next if n.in?(SPECIAL_ATTRIBUTES) || n =~ /^without-/
         next if el.attributes['part'] && n == 'id' # The id is rendered on the <div class="part-wrapper"> instead

data/lib/hobo/lifecycles.rb

@@ -24,6 +24,7 @@ module Hobo
         # TODO: figure out how to merge with parent, if desired
         if self.const_defined?(:Lifecycle)
           lifecycle = self::Lifecycle
+          state_field_class = self::LifecycleStateField
         else
           # First call
           

data/lib/hobo/model.rb

@@ -57,11 +57,12 @@ module Hobo
 
         WillPaginate::Finder::ClassMethods.class_eval do
           def paginate_with_hobo_metadata(*args, &block)
-            returning paginate_without_hobo_metadata(*args, &block) do |collection|
-              collection.member_class     = self
-              collection.origin           = try.proxy_owner
-              collection.origin_attribute = try.proxy_reflection._?.name
-            end
+            # using 'returning' here triggers a full load
+            collection = paginate_without_hobo_metadata(*args, &block)
+            collection.member_class     = self
+            collection.origin           = try.proxy_owner
+            collection.origin_attribute = try.proxy_reflection._?.name
+            collection
           end
           alias_method_chain :paginate, :hobo_metadata
 

data/lib/hobo/translations.rb

@@ -72,7 +72,12 @@ module Hobo
     
       Rails.logger.info "..translate(#{key}, #{options.inspect}) to #{I18n.locale}" if defined?(HOBO_VERBOSE_TRANSLATIONS)
       
-      I18n.translate(key.to_sym, options)+(key_prefix ? key_prefix:"")
+      translation = I18n.translate(key.to_sym, options)
+      if translation.respond_to? :to_str
+        key_prefix ? translation.to_str+key_prefix : translation
+      else
+        "translation invalid: #{key}"
+      end
     end
 
     # if somebody includes us, give them ht as an instance method

data/taglibs/rapid_core.dryml

@@ -1,4 +1,3 @@
-<!-- Core Rapid tags and tags that don't belong anywhere else. -->
 
 <!-- Renders a table with one row per field, where each row contains a `<th>` with the field name, and a `<td>` with (by default)
      a `<view>` of the field.
@@ -310,7 +309,7 @@ Or a new page if the context is a class:
 
 * to:  Use this item as the target instead of the current context.
 
-* params, query-params:  These are appended to the target as a query string after a "?".
+* params, query-params:  These are appended to the target as a query string after a "?".  Params are passed as a ruby hash.  Example: `params="&{id=>17, name=>'joe'}"`
 
 * href, name:  If either of these attributes are present, the smart features of this tag are turned off.
 
@@ -613,8 +612,8 @@ The context should be a user object. If `this == current_user` the "you" form is
 <def tag="dev-user-changer">
   <set user="&Hobo::User.default_user_model"/>
   <select-menu if="&user && RAILS_ENV == 'development'"
-               first-option="Guest" options="&user.all(:limit => 30).*.login"
-               onchange="location.href = '#{dev_support_path}/set_current_user?login=' + this.options[this.selectedIndex].value"
+               first-option="#{ht('hobo.dev_user_changer.guest', {:default=>'Guest'})}" options="&user.all(:limit => 30).*.login"
+               onchange="location.href = '#{dev_support_path}/set_current_user?login=' + encodeURIComponent(this.options[this.selectedIndex].value)"
                selected="#{current_user.login}"
                class="dev-user-changer"
                merge-attrs/>

data/taglibs/rapid_navigation.dryml

@@ -70,13 +70,13 @@ 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">Logged in as <name/></a></li>
-        <li class='nav-item' param="account"><a action="account">Account</a></li>
-        <li class='nav-item' param="log-out"><a href="&logout_url">Log out</a></li>
+        <li class='nav-item' param="logged-in-as"><a to="&current_user"><ht key="hobo.actions.logged_in_as" name="#{name}">Logged in as <name/></ht></a></li>
+        <li class='nav-item' param="account"><a action="account"><ht key="hobo.actions.account">Account</ht></a></li>
+        <li class='nav-item' param="log-out"><a href="&logout_url"><ht key="hobo.actions.logout">Log out</ht></a></li>
       </if>
       <else>
-        <li class='nav-item' param="log-in"><a href="&login_url">Log in</a></li>
-        <li if="&signup_url" class="nav-item" param="sign-up"><a href="&signup_url">Sign up</a></li>
+        <li class='nav-item' param="log-in"><a href="&login_url"><ht key="hobo.actions.login">Log in</ht></a></li>
+        <li if="&signup_url" class="nav-item" param="sign-up"><a href="&signup_url"><ht key="hobo.actions.signup">Sign up</ht></a></li>
       </else>
     </ul>
   </do>

data/taglibs/rapid_pages.dryml

@@ -243,7 +243,7 @@ The flash is output in a `<div class="flash notice">`, where `notice` is the `ty
 
 <!-- Renders `<flash-message>` for every flash type given in the `names` attribute (comma separated), or for all flash messages that have been set if `names` is not given -->
 <def tag="flash-messages" attrs="names"><%=
-  scope.flash_rendered = true
+  scope.flash_rendered = true if scope.respond_to? :flash_rendered
   names = names.nil? ? flash.keys : comma_split(names)
   names.map { |name| flash_message :type => name }.join
 %></def>

data/taglibs/rapid_plus.dryml

@@ -15,7 +15,7 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
       <div class="search">
         <form param="search-form" method="get" action="">
           <hidden-fields for-query-string skip="page, search"/>
-          <span>Search</span>
+          <span><ht key="hobo.table_plus.search">Search</ht></span>
           <input class="search" type="search" name="search" value="&params[:search]"/>
           <submit label="Go" class="search-button" param="search-submit"/>
         </form>
@@ -43,7 +43,7 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
         <th if="&all_parameters[:controls]" class="controls"></th>
       </field-heading-row>
     </table>    
-    <do param="empty-message" if="empty?">No <collection-name lowercase/> to display</do>
+    <do param="empty-message" if="empty?"><ht key="hobo.table_plus.empty" model="#{name.downcase}">No <collection-name lowercase/> to display</ht></do>
 
    
     <page-nav param if="&this.respond_to?(:page_count) || this.respond_to?(:total_pages)"/>
@@ -101,7 +101,7 @@ This tag assumes the controller has a `reorder` action. This action is added aut
   <% name ||= collection_name.pluralize -%>
   <section class="#{name.gsub(' ', '-').dasherize} preview-with-more" param="default">
     <h3 param="heading"><%= name.titleize %></h3>
-    <a param="more">More <type-name plural lowercase/>...</a>
+    <a param="more"><ht key="hobo.live_search.more">More</ht> <type-name plural lowercase/>...</a>
     <collection param/>
     <a action="new" if="&can_create?(this.new)" param="new-link">New <%= this.member_class.view_hints.model_name %></a>
   </section>
@@ -125,11 +125,11 @@ This tag assumes the controller has a `reorder` action. This action is added aut
 <!-- Provides an ajax-powered *find-as-you-type* live search field which is hooked up to Hobo's site-side search feature. At the moment this tag is not very flexible. It is not easy to use if for anything other than Hobo's site-wide search. -->
 <def tag="live-search">
   <div class="search">
-    <label for="search-field">Search</label><input type="search" class="live-search"/>
+    <label for="search-field"><ht key="hobo.live_search.label">Search</ht></label><input type="search" class="live-search"/>
     <spinner id="search-spinner"/>
   </div>
   <section class="hidden" id="search-results-panel">
-    <h2>Search Results</h2><div param="close-button">close</div>
+    <h2><ht key="hobo.live_search.results_label">Search Results</ht></h2><div param="close-button"><ht key="hobo.live_search.close_button">close</ht></div>
     <section id="search-results">&nbsp;</section>
   </section>
 </def>

data/taglibs/rapid_summary.dryml

@@ -102,7 +102,9 @@
 </def>
 
 <def tag="gem-version-requirement">
-  <%= this.requirements.map{|l| l.first+l.second.to_s}.join(",") -%>
+  <unless test="this.nil?"><%=
+    this.requirements.map{|l| l.first+l.second.to_s}.join(",")
+-%></unless>
 </def>
 
 <!-- inside `<with-gems>`, returns the version required -->
@@ -123,7 +125,7 @@
 <!-- inside `<with-gems>`, returns the gem dependencies -->
 <def tag="gem-dependencies">
   <repeat with="&this.dependencies">
-    <%= this.name -%><gem-version-requirement:requirement />
+    <%= this.name -%><gem-version-requirement with="&this.requirement || this.version_requirements" />
   </repeat>
 </def>
 

data/taglibs/rapid_translations.dryml

@@ -20,7 +20,7 @@ Will lookup the "my.app"-key for your locale and replaces the "My Application" c
 
 Will look up both the "my"- and "app"-key for your locale, and replaces the "My Application" with the "my"-key contents (interpolated using the "app"-key.
 
-sample.en.yml-file:
+sample.no.yml-file:
 
       "no":
         my: "Mitt {{app}}"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Tom Locke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 +11:00
+date: 2010-06-01 00:00:00 +01:00
 default_executable: hobo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -69,8 +69,8 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id004
 description: