hobo 1.3.0.pre12 → 1.3.0.pre13

data/Rakefile

@@ -36,8 +36,7 @@ Rake::TestTask.new(:test) { |t|
 namespace "test" do
   desc "Run the doctests"
   task :doctest do |t|
-    files=Dir['doctest/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
-    # note, tests in doctest/hobo/ are out of date
+    files=Dir['doctests/**/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
     exit(1) if !system("#{RUBYDOCTEST} #{files}")
   end
 end

data/VERSION

@@ -1 +1 @@
-1.3.0.pre12
+1.3.0.pre13

data/doctests/hobo/lifecycles.rdoctest

@@ -240,4 +240,3 @@ Requester cancels
         => "destroy"
 
 
->> FileUtils.rm_rf  TEST_APP_ROOT

data/doctests/hobo/model.rdoctest

@@ -325,9 +325,4 @@ This provides a shortcut to the corresponding
     >> Post.view_hints
     => PostHints
 
-Cleanup
-{.hidden}
-
-    >> FileUtils.rm_rf  TEST_APP_ROOT
-{.hidden}
 

data/doctests/hobo/multi_model_forms.rdoctest

@@ -28,13 +28,12 @@ Contents
                                                :host => "localhost",
                                                :username => mysql_user,
                                                :password => mysql_password)
-    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../../hobo_fields/lib')
-    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../../hobo_support/lib')
-    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../../hobo/lib')
+    >> $:.unshift File.expand_path('../../../../hobo_support/lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../../hobo_fields/lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../../dryml/lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../lib', __FILE__)
     >> gem 'will_paginate', ">= 3.0.pre"
     >> require 'will_paginate'
-    >> require 'hobo_support'
-    >> require 'hobo_fields'
     >> require 'hobo'
     >> ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(StringIO.new(''))
     >>

data/doctests/hobo/scopes.rdoctest

@@ -67,17 +67,16 @@ We also need to get ActiveRecord set up with a database connection
 Some load path manipulation:
 {.hidden}
 
-    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../../hobo_fields/lib')
-    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../../hobo_support/lib')
-    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../../hobo/lib')
+    >> $:.unshift File.expand_path('../../../../hobo_support/lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../../hobo_fields/lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../../dryml/lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../lib', __FILE__)
 {.hidden}
 
 And we'll require hobo:
 {.hidden}
 
     >> require 'will_paginate'
-    >> require 'hobo_support'
-    >> require 'hobo_fields'
     >> require 'hobo'
 {.hidden}
 

data/doctests/prepare_testapp.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 system %(rake test:prepare_testapp)
-FileUtils.chdir '/tmp/hobo_testapp'
+TESTAPP_PATH = '/tmp/hobo_testapp'
+FileUtils.chdir TESTAPP_PATH
 require 'config/environment'
 require 'rails/generators'
 Rails::Generators.configure!

data/lib/generators/hobo/basic/basic_generator.rb

@@ -7,10 +7,11 @@ module Hobo
     end
 
     def copy_rapid_files
-      template  'application.dryml.erb', 'app/views/taglibs/application.dryml'
-      copy_file 'application.css',       'public/stylesheets/application.css'
-      copy_file 'dryml-support.js',      'public/javascripts/dryml-support.js'
-      copy_file 'guest.rb',              'app/models/guest.rb'
+      template  'application.dryml.erb',        'app/views/taglibs/application.dryml'
+      copy_file 'application.css',              'public/stylesheets/application.css'
+      copy_file 'dryml-support.js',             'public/javascripts/dryml-support.js'
+      copy_file 'dryml_taglibs_initializer.rb', 'config/initializers/dryml_taglibs.rb'
+      copy_file 'guest.rb',                     'app/models/guest.rb'
     end
 
   end

data/lib/generators/hobo/basic/templates/dryml_taglibs_initializer.rb

@@ -0,0 +1 @@
+Dryml.precompile_taglibs if File.basename($0) != "rake" && Rails.env.production?

data/lib/generators/hobo/routes/templates/hobo_routes.rb.erb

@@ -17,7 +17,7 @@
         routes = gr == 'lifecycle_routes' ? router.send(gr.to_sym, subsite) : router.send(gr.to_sym) -%>
     <%- unless routes.empty? -%>
 
-  <%= "  " if subsite %><%= "# #{gr.humanize} for controller :#{controller.controller_name}" %>
+  <%= "  " if subsite %><%= %(# #{gr.humanize} for controller "#{controller.controller_path}") %>
     <%- end -%>
       <%- for route in routes -%>
   <%= "  " if subsite %><%= route %>

data/lib/hobo/controller.rb

@@ -49,7 +49,7 @@ module Hobo
 
     def redirect_to_with_object_url(destination, *args)
       if destination.is_one_of?(String, Hash, Symbol)
-        redirect_to_without_object_url(destination)
+        redirect_to_without_object_url(destination, *args)
       else
         redirect_to_without_object_url(object_url(destination, *args))
       end
@@ -70,7 +70,14 @@ module Hobo
 
 
     def ajax_update_response(page_path, render_specs, results={})
-      renderer = Dryml.page_renderer(view_context, page_path) if page_path
+      if page_path
+        rr = ActionController::Routing::Routes.recognize_path(page_path)
+        identifier = view_context.view_paths.find( rr[:action],
+                                                   rr[:controller],
+                                                   false,
+                                                   view_context.lookup_context.instance_variable_get('@details')).identifier
+        renderer = Dryml.page_renderer(view_context, identifier, [], rr[:controller])
+      end
 
       render :update do |page|
         page << "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;"

data/lib/hobo/controller/model.rb

@@ -358,16 +358,15 @@ module Hobo
         @invalid_record = this
         opt = ActionController::Routing::Routes.recognize_path(params[:page_path])
         controller = opt[:controller]
-        view = opt[:action]
-        view = default_action if view == Dryml::EMPTY_PAGE
+        action = opt[:action]
 
         # Hack fix for Bug 477.  See also bug 489.
-        if self.class.name == "#{controller.camelize}Controller" && view == "index"
+        if self.class.name == "#{controller.camelize}Controller" && action == "index"
           params['action'] = 'index'
           self.action_name = 'index'
           index
         else
-          render :template => "#{controller}/#{view}"
+          render :template => "#{controller}/#{action}"
         end
       else
         render :action => default_action
@@ -452,7 +451,7 @@ module Hobo
       do_pagination = options.delete(:paginate) && finder.respond_to?(:paginate)
       finder = Array.wrap(options.delete(:scope)).inject(finder) { |a, v| a.send(*Array.wrap(v).flatten) }
 
-      options[:order] = :default unless options[:order] || finder.send(:scope, :find)._?[:order]
+      options[:order] = finder.default_order unless options[:order] || finder.try.order_values.present?
 
       if do_pagination
         options.reverse_merge!(:page => params[:page] || 1)
@@ -735,7 +734,7 @@ module Hobo
 
     def hobo_completions(attribute, finder, options={})
       options = options.reverse_merge(:limit => 10, :param => :query, :query_scope => "#{attribute}_contains")
-      finder = finder.limit(options[:limit]) unless finder.send(:scope, :find, :limit)
+      finder = finder.limit(options[:limit]) unless finder.try.limit_value
 
       begin
         finder = finder.send(options[:query_scope], params[options[:param]])

data/lib/hobo/rapid/taglibs/rapid_forms.dryml

@@ -223,7 +223,7 @@ The standard form tag does not have any parameters, nor does it have any default
       page_path = if (request.post? || request.put?) && params[:page_path]
                     params[:page_path]
                   else
-                    view_name.sub(Dryml::EMPTY_PAGE, params[:action] || '')
+                    request.fullpath
                   end
       page_path_hidden = hidden_field_tag("page_path", page_path)
     end

data/lib/hobo/rapid/taglibs/rapid_i18n.dryml

@@ -115,7 +115,7 @@ With the `your` attribute and in the special case the context is a Hobo::Model::
   attrs = {}
   all_attributes.each_pair{|k,v| attrs[k.to_sym] = v} -%>
 <% if your && belong_class < Hobo::Model::User && this.kind_of?(Hobo::Model::User) && I18n.locale == :en -%>
-    <your key="&collection" merge-attrs="&{:count=>c, :name=>this.name}.merge(attrs)" capitalize>
+    <your key="&collection" merge-attrs="&{:name=>this.name}.merge(attrs)" capitalize>
       <%= belong_class.human_attribute_name(collection.to_sym, attrs) %>
     </your>
 <% else -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  hash: -1637175961
+  hash: -1637175964
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  - pre12
-  version: 1.3.0.pre12
+  - pre13
+  version: 1.3.0.pre13
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -04:00
+date: 2010-10-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175961
+        hash: -1637175964
         segments: 
         - 1
         - 3
         - 0
-        - pre12
-        version: 1.3.0.pre12
+        - pre13
+        version: 1.3.0.pre13
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175961
+        hash: -1637175964
         segments: 
         - 1
         - 3
         - 0
-        - pre12
-        version: 1.3.0.pre12
+        - pre13
+        version: 1.3.0.pre13
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,13 +93,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175961
+        hash: -1637175964
         segments: 
         - 1
         - 3
         - 0
-        - pre12
-        version: 1.3.0.pre12
+        - pre13
+        version: 1.3.0.pre13
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -181,6 +181,7 @@ files:
 - lib/generators/hobo/basic/templates/application.css
 - lib/generators/hobo/basic/templates/application.dryml.erb
 - lib/generators/hobo/basic/templates/dryml-support.js
+- lib/generators/hobo/basic/templates/dryml_taglibs_initializer.rb
 - lib/generators/hobo/basic/templates/en_injection.yml
 - lib/generators/hobo/basic/templates/guest.rb
 - lib/generators/hobo/controller.rb