hobo 0.8.1 → 0.8.2

data/CHANGES.txt

@@ -1,3 +1,48 @@
+=== Hobo 0.8.2 ===
+
+Hobo models -- improvement to name-in-URL (#to_param)
+
+Added missing input for time fields
+
+Rapid forms -- added missing hours/minutes/seconds fields to datetime input
+
+Reorg of Hobo Rakefile, in preprartion for move to Shoulda
+
+Rapid -- fix to <create-button>
+
+Echoe tasks -- adding workaround for developer-dependencies problem
+
+Rapid -- fixes to css class named that had '_' instead of '-'
+
+Rapid pages generators -- improvements to form submit button labels
+
+ModelController - set the provided key on the record *before* the view permission check during a lifecycle
+transition
+
+Hobo Models -- Model.user_find can now take a block to perform actions on the record prior to the permission check
+
+Added Rails dependency to hobofields gem
+
+Fix to Rails dependency - any Rails >= 2.1 is ok
+
+Reorganised generator tests
+
+Hobo users now have an #account_active? method. Used in two places:
+
+  - This method rather than the return value of the block passed to hobo_login, is now used to figure out if an
+    account is active when logging in.
+    
+  - After signing up, also log the user in iff account_active? is true. This is useful if there is a second step to
+    signing up, such as email activation
+
+hobo_front_controller generator -- improved title of home page
+
+Rapid generators -- fix to owner link on new-for-owner page
+
+Fix to bug where validations were not happening during lifecycle creates/transitions
+
+
+
 === Hobo 0.8.1 ===
 
     Fixes to generating and loading subsite controllers

data/Manifest

@@ -142,7 +142,7 @@ tasks/environments.rake
 tasks/fix_dryml.rake
 tasks/generate_tag_reference.rb
 tasks/hobo_tasks.rake
-test/test_generator_helper.rb
-test/test_helper.rb
-test/test_hobo_model_controller_generator.rb
+test/generators/test_generator_helper.rb
+test/generators/test_helper.rb
+test/generators/test_hobo_model_controller_generator.rb
 uninstall.rb

data/Rakefile

@@ -4,8 +4,21 @@ require 'rake/testtask'
 
 load "tasks/generate_tag_reference.rb"
 
-desc 'Default: run specs.'
-task :default => :spec
+desc "Default Task"
+task :default => [ :test ]
+
+
+# --- Testing --- #
+
+desc "Run all unit tests"
+Rake::TestTask.new(:test) { |t|
+  t.libs << "test"
+  t.test_files=Dir.glob( "test/**/*_test.rb" ).sort
+  t.verbose = true
+}
+
+
+# --- RDoc --- #
 
 desc 'Generate documentation for the Hobo plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
@@ -16,6 +29,9 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+
+# --- Packaging and Rubyforge --- #
+
 require 'echoe'
 
 Echoe.new('hobo') do |p|
@@ -26,91 +42,16 @@ Echoe.new('hobo') do |p|
   p.project = "hobo"
 
   p.changelog = "CHANGES.txt"
-  p.version   = "0.8.1"
+  p.version   = "0.8.2"
 
   p.dependencies = [
-    'hobosupport >=0.8.1',
-    'hobofields >=0.8.1',
-    'rails =2.1',
+    'hobosupport >=0.8.2',
+    'hobofields >=0.8.2',
+    'rails >=2.1',
     'mislav-will_paginate >=2.2.1']
+    
+  p.development_dependencies = []
 end
 
 
 
-
-# --- RSpec --- #
-
-# In rails 1.2, plugins aren't available in the path until they're loaded.
-# Check to see if the rspec plugin is installed first and require
-# it if it is.  If not, use the gem version.
-PLUGIN_DIR = File.dirname(__FILE__)
-
-rspec_base = File.expand_path(PLUGIN_DIR + '/spec/rails_root/vendor/plugins/rspec/lib')
-$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
-require '../hobo_spec/rails_root/vendor/plugins/rspec/lib/spec/rake/spectask'
-require '../hobo_spec/rails_root/vendor/plugins/rspec/lib/spec/translator'
-
-spec_prereq = :noop # File.exist?(File.join(PLUGIN_DIR, 'config', 'database.yml')) ? "db:test:prepare" : :noop
-task :noop do
-end
-
-task :stats => "spec:statsetup"
-
-SPEC_HOME = "#{PLUGIN_DIR}/../hobo_spec"
-
-desc "Run all specs in spec directory (excluding plugin specs)"
-Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
-  t.spec_opts = ['--options', "\"#{SPEC_HOME}/spec.opts\""]
-  t.spec_files = FileList["#{SPEC_HOME}/unit/**/*_spec.rb"]
-end
-
-namespace :spec do
-  desc "Run all specs in spec directory with RCov (excluding plugin specs)"
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.spec_opts = ['--options', "\"#{SPEC_HOME}/spec.opts\""]
-    t.spec_files = FileList["#{SPEC_HOME}/unit/**/*_spec.rb"]
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec', '--rails']
-  end
-
-  desc "Print Specdoc for all specs (excluding plugin specs)"
-  Spec::Rake::SpecTask.new(:doc) do |t|
-    t.spec_opts = ["--format", "specdoc", "--dry-run"]
-    t.spec_files = FileList["#{SPEC_HOME}/unit/**/*_spec.rb"]
-  end
-
-  [:models, :controllers, :views, :helpers].each do |sub|
-    desc "Run the specs under spec/#{sub}"
-    Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
-      t.spec_opts = ['--options', "\"#{SPEC_HOME}/spec.opts\""]
-      t.spec_files = FileList["#{SPEC_HOME}/#{sub}/**/*_spec.rb"]
-    end
-  end
-
-  # Setup specs for stats
-  task :statsetup do
-    require 'code_statistics'
-    ::STATS_DIRECTORIES << %w(Model\ specs spec/models)
-    ::STATS_DIRECTORIES << %w(View\ specs spec/views)
-    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers)
-    ::STATS_DIRECTORIES << %w(Helper\ specs spec/views)
-    ::CodeStatistics::TEST_TYPES << "Model specs"
-    ::CodeStatistics::TEST_TYPES << "View specs"
-    ::CodeStatistics::TEST_TYPES << "Controller specs"
-    ::CodeStatistics::TEST_TYPES << "Helper specs"
-    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
-  end
-
-  namespace :db do
-    namespace :fixtures do
-      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
-      task :load => :environment do
-        require 'active_record/fixtures'
-        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(SPEC_HOME, 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-          Fixtures.create_fixtures("#{SPEC_HOME}/fixtures", File.basename(fixture_file, '.*'))
-        end
-      end
-    end
-  end
-end

data/dryml_generators/rapid/pages.dryml.erb

@@ -57,7 +57,9 @@ new_link = linkable?(:new)
       </section>
       
       <section param="content-body">
-        <form param/>
+        <form param>
+          <submit: label="Create <%= model_name :title %>"/>
+        </form>
       </section>
     </content:>
   </page>
@@ -77,7 +79,7 @@ if collection
   collection_class = model.reflections[collection].klass
   owner            = model.reverse_reflection(collection)._?.name
   if owner
-    add_link = collection &&linkable?(collection_class, :"new_for_#{owner}")
+    add_link = collection && linkable?(collection_class, :"new_for_#{owner}")
     add_form = !add_link && linkable?(collection_class, :"create_for_#{owner}", :method => :post)
   end
 end
@@ -174,7 +176,7 @@ name_attribute = model.name_attribute
 <%
 collection_name = model.reverse_reflection(owner).name.to_s
 owner_model     = model.reflections[owner].klass
-owner_tag       = linkable?(owner_model) ? "a" : "name"
+owner_tag       = linkable?(owner_model, :show) ? "a" : "name"
 owner    = owner.to_s
 -%>
 <% if :index.in? actions -%>
@@ -228,6 +230,7 @@ new_link = :new.in?(actions)
       <section param="content-body">
         <form owner="<%= owner %>" method="post" param>
           <field-list: skip="<%= owner %>"/>
+          <submit: label="Create <%= model_name :title %>"/>
         </form>
       </section>
     </content:>

data/hobo.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Hobo-0.8.1
+# Gem::Specification for Hobo-0.8.2
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Tom Locke
 autorequire: 
 bindir: bin
 
-date: 2008-09-08 00:00:00 +01:00
+date: 2008-09-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hobofields
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -41,7 +41,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: "2.1"
     version: 
@@ -55,16 +55,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: The web app builder for Rails
 email: tom@tomlocke.com
 executables: 
@@ -281,9 +271,9 @@ files:
 - tasks/fix_dryml.rake
 - tasks/generate_tag_reference.rb
 - tasks/hobo_tasks.rake
-- test/test_generator_helper.rb
-- test/test_helper.rb
-- test/test_hobo_model_controller_generator.rb
+- test/generators/test_generator_helper.rb
+- test/generators/test_helper.rb
+- test/generators/test_hobo_model_controller_generator.rb
 - uninstall.rb
 - hobo.gemspec
 has_rdoc: true
@@ -317,6 +307,7 @@ rubygems_version: 1.2.0
 specification_version: 2
 summary: The web app builder for Rails
 test_files: 
-- test/test_generator_helper.rb
-- test/test_helper.rb
-- test/test_hobo_model_controller_generator.rb
+- test/dryml/complilation_test.rb
+- test/generators/test_generator_helper.rb
+- test/generators/test_helper.rb
+- test/generators/test_hobo_model_controller_generator.rb

data/lib/hobo.rb

@@ -26,7 +26,7 @@ class HoboError < RuntimeError; end
 
 module Hobo
 
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 
   class RawJs < String; end
 

data/lib/hobo/hobo_helper.rb

@@ -151,6 +151,7 @@ module Hobo
 
 
     def context_map(enum = this)
+      # TODO: Calls to respond_to? in here can cause the full collection hiding behind a scoped collection to get loaded
       res = []
       empty = true
       if enum.respond_to?(:each_pair)

data/lib/hobo/lifecycles/lifecycle.rb

@@ -144,7 +144,7 @@ module Hobo
       end
 
 
-      def become(state_name, validate=false)
+      def become(state_name, validate=true)
         state_name = state_name.to_s
         if self.state != state_name
           record.write_attribute self.class.state_field, state_name

data/lib/hobo/model.rb

@@ -133,6 +133,7 @@ module Hobo
 
       def user_find(user, *args)
         record = find(*args)
+        yield(record) if block_given?
         raise PermissionDeniedError unless Hobo.can_view?(user, record)
         record
       end
@@ -390,9 +391,9 @@ module Hobo
     
     
     def to_param
-      name_attr = self.class.name_attribute
-      if name_attr
-        readable = send(name_attr).to_s.downcase.gsub(/[^a-z0-9]+/, '-').gsub(/-+$/, '').gsub(/^-+$/, '').split('-')[0..5].join('-')
+      name_attr = self.class.name_attribute and name = send(name_attr)
+      if name_attr && !name.blank?
+        readable = name.to_s.downcase.gsub(/[^a-z0-9]+/, '-').gsub(/-+$/, '').gsub(/^-+$/, '').split('-')[0..5].join('-')
         @to_param ||= "#{id}-#{readable}"
       else
         id

data/lib/hobo/model_controller.rb

@@ -308,7 +308,9 @@ module Hobo
 
 
     def find_instance(options={})
-      model.user_find(current_user, params[:id], options)
+      model.user_find(current_user, params[:id], options) do |record|
+        yield record if block_given?
+      end
     end
 
 
@@ -580,9 +582,11 @@ module Hobo
 
 
     def prepare_for_transition(name, options={})
-      self.this = find_instance
-      this.exempt_from_edit_checks = true
-      this.lifecycle.provided_key = params[:key]
+      self.this = find_instance do |record|
+        # The block allows us to perform actions on the records before the permission check
+        record.exempt_from_edit_checks = true
+        record.lifecycle.provided_key = params[:key]
+      end
       @transition = this.lifecycle.find_transition(name, current_user)
     end
 

data/lib/hobo/rapid_helper.rb

@@ -142,7 +142,6 @@ module Hobo::RapidHelper
   def standard_fields(model, include_timestamps=false)
     fields = model.attr_order.*.to_s & model.content_columns.*.name
     fields -= %w{created_at updated_at created_on updated_on deleted_at} unless include_timestamps
-    debugger if model == User
     fields.reject! { |f| model.never_show? f }
     fields
   end

data/lib/hobo/user.rb

@@ -98,7 +98,7 @@ module Hobo
     end
 
     def account_active?
-      state == 'active'
+      !self.class.has_lifecycle? || !'active'.in?(self.class::Lifecycle.state_names) || state == 'active'
     end
 
     # Encrypts the password with the user salt

data/lib/hobo/user_controller.rb

@@ -64,13 +64,11 @@ module Hobo
         else
           old_user = current_user
           self.current_user = user
+          
+          yield if block_given?
 
-          # If supplied, a block can be used to test if this user is
-          # allowed to log in (e.g. the account may be disabled)
-          account_available = block_given? ? yield : true
-
-          if !account_available
-            # block returned false - cancel this login
+          if !user.account_active?
+            # account not activate - cancel this login
             self.current_user = old_user
             render :action => :account_disabled unless performed?
           else
@@ -88,7 +86,10 @@ module Hobo
 
     def hobo_do_signup(&b)
       do_creator_action(:signup) do
-        flash[:notice] = "Thanks for signing up!" if valid?
+        if valid?
+          flash[:notice] = "Thanks for signing up!"
+          flash[:notice] << " You must activate your account before you can log in. Please check your email." unless this.account_active?
+        end
         response_block(&b) or if valid?
                                 self.current_user = this if this.account_active?
                                 redirect_back_or_default(home_page)

data/rails_generators/hobo/templates/patch_routing.rb

@@ -21,8 +21,6 @@ if Rails::VERSION::STRING.in? ["2.1.0", "2.1.1"]
     end
   end
 
-  ActionController::Routing::Routes.reload!
-
 else
   RAILS_DEFAULT_LOGGER.info "****"
   RAILS_DEFAULT_LOGGER.info "**** The file config/initializers/patch_routing.rb is not in use"

data/rails_generators/hobo_front_controller/templates/index.dryml

@@ -1,4 +1,4 @@
-<page>
+<page title="Home">
 
   <body: class="front-page"/>
 

data/rails_generators/hobo_rapid/templates/hobo-rapid.js

@@ -435,7 +435,6 @@ var Hobo = {
     
     
     fixSectionGroup: function(e) {
-        alert(e.outerHTML)
 	    rows = e.childElements().map(function(e, i) {
     	    cells = e.childElements().map(function(e, i) {
         	    return e.outerHTML.sub("<DIV", "<td  valign='top'").sub(/<\/DIV>$/i, "</td>")

data/taglibs/rapid.dryml

@@ -133,12 +133,15 @@
      
 
 <def tag="collection-name" attrs="singular, lowercase, dasherize"><%=
-  name = (attr = this.try.origin_attribute and attr.to_s) || type_name(:plural => true)
-  name = name.titleize
-  name = name.singularize if singular
-  name = name.downcase if lowercase
-  name = name.underscore.gsub('_', '-') if dasherize
-  name
+  if (attr = this.try.origin_attribute)
+    name = attr.to_s
+    name = dasherize ? name.underscore.dasherize : name.titleize
+    name = name.singularize if singular
+    name = name.downcase if lowercase
+    name
+  else
+    type_name(:plural => !singular, :lowercase => lowercase, :dasherize => dasherize)
+  end
 %></def>
 
 
@@ -188,7 +191,7 @@
         # This target is registered with ModelRouter as not linkable
         content
       else
-        css_class = target.try.origin_attribute || target.class.name.underscore
+        css_class = target.try.origin_attribute || target.class.name.underscore.dasherize
         add_classes!(attributes, "#{css_class}-link")
       
         href.sub!(/\?|$/, ".#{format}\\0") unless format.blank?

data/taglibs/rapid_forms.dryml

@@ -21,7 +21,7 @@
 %></def>
 
 
-<def tag="form" polymorphic attrs="update, hidden-fields, action, method, web-method, lifecycle, owner, enctype"><%= 
+<def tag="form" polymorphic attrs="update, hidden-fields, action, method, web-method, lifecycle, owner"><%= 
   ajax_attrs, html_attrs = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
    
   new_record = this.try.new_record?
@@ -90,14 +90,12 @@
     
     if action.nil? # don't add automatic css classes if the action was specified
       if web_method
-        add_classes!(html_attrs, "#{type_id}_#{web_method}_form")
+        add_classes!(html_attrs, "#{type_id}-#{web_method}-form")
       else
-        add_classes!(html_attrs, "#{'new_' if new_record}#{type_id}")
+        add_classes!(html_attrs, "#{'new-' if new_record}#{type_id}")
       end
     end
 
-    html_attrs[:enctype] = enctype
-     
     Hobo::Dryml.last_if = true
     element("form", html_attrs, body)
   end
@@ -161,8 +159,13 @@
   <%= select_date(this || Time.now, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
 </def>
 
+<def tag="input" for="time" attrs="order">
+  <% order = order.nil? ? [:year, :month, :day, :hour, :minute, :second] : comma_split(order).*.to_sym -%>
+  <%= select_date(this || Time.now, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
+</def>
+
 <def tag="input" for="datetime" attrs="order">
-  <% order = order.nil? ? [:year, :month, :day ] : comma_split(order).*.to_sym -%>
+  <% order = order.nil? ? [:year, :month, :day, :hour, :minute, :second] : comma_split(order).*.to_sym -%>
   <%= select_datetime(this || Time.now, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
 </def>
 
@@ -277,7 +280,7 @@
     ajax_attributes = { :message => message }
     class_name = new.class.name.underscore
     ajax_attributes[:params] = { class_name => fields } unless fields.empty?
-    func = ajax_updater(object_url(new.class), update, ajax_attributes)
+    func = ajax_updater(object_url(new.class, :method => :post), update, ajax_attributes)
     element :input, add_classes(attributes.merge(:type =>'button', :onclick => func, :value => label),
                                 "button create-button create-#{class_name}-button"), nil, true, true
   end

data/tasks/generate_tag_reference.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'hobosupport'
-Dependencies.load_paths << File.dirname(__FILE__) + "/../lib"
+ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__) + "/../lib"
 
 require 'rexml/xpath'
 XPath = REXML::XPath

data/test/dryml/complilation_test.rb

@@ -0,0 +1,261 @@
+require "#{File.dirname __FILE__}/dryml_test_case"
+
+class CompilationTest < DrymlTestCase
+  
+  should "compile tag calls as method calls" do
+    assert_compiles_to "<% _output(foo.to_s) %>", "<foo/>"
+  end
+
+  should "convert dashes in tag names to underscores in compiled method calls" do
+    assert_compiles_to "<% _output(foo_baa.to_s) %>", "<foo-baa/>"
+  end
+
+  should "compile attributes as keyword parameters" do
+    assert_compiles_to '<% _output(foo({:a => "1", :b => "2"}, {})) %>', "<foo a='1' b='2'/>"
+  end
+
+  should "convert attribute names with dashes in tag calls to symbols with underscores" do
+    assert_compiles_to "<% _output(foo({:my_attribute => \"1\"}, {})) %>", "<foo my-attribute='1'/>"
+  end
+
+  should "compile code attributes as ruby code" do
+    assert_compiles_to '<% _output(foo({:a => (1 + 2)}, {})) %>', "<foo a='&1 + 2'/>"
+  end
+
+  should "compile attributes with no RHS as passing `true`" do
+    assert_compiles_to '<% _output(foo({:a => (true)}, {})) %>', "<foo a/>"
+  end
+
+  should "compile content of a tag call as the default parameter" do
+    assert_compiles_to "<% _output(foo({}, { :default => proc { |_foo__default_content| new_context { %>the body<% } }, })) %>", 
+                       "<foo>the body</foo>"
+  end
+
+  should "support <param_content/> inside the content of a tag" do
+    src = "<foo>!!<param-content/>??</foo>"
+    assert_compiles_to "<% _output(foo({}, { :default => proc { |_foo__default_content| new_context { %>!!<%= _foo__default_content && _foo__default_content.call %>??<% } }, })) %>", src
+  end
+
+  should "support the 'for' attribute on <param-content/>" do
+    src = "<x><y>123<param-content for='x'/>456</y></x>"
+    assert_compiles_to(
+      "<% _output(x({}, { :default => proc { |_x__default_content| new_context { %><% _output(y({}, { :default => proc { |_y__default_content| new_context { %>" +
+      "123<%= _x__default_content && _x__default_content.call %>456" +
+      "<% } }, })) %><% } }, })) %>", src)
+  end
+
+  should "allow :foo as a shorthand for field='foo' on tags" do
+    assert_compiles_to '<% _output(foo({:field => "name"}, {})) %>', "<foo:name/>"
+  end
+
+  should "allow static tag names like :title as a shorthand for field='title'" do
+    assert_compiles_to  '<% _output(foo({:field => "name"}, {})) %>', "<foo:name/>"
+  end
+
+  should "allow close tags to ommit the :field_name part" do
+    assert_compiles_to '<% _output(foo({:field => "name"}, { :default => proc { |_foo__default_content| new_context { %><% } }, })) %>', "<foo:name></foo>"
+      
+  end
+
+  should "compile tag calls with merge-attrs" do
+    assert_compiles_to "<% _output(foo(merge_attrs({},(attributes) || {}), {})) %>",          "<foo merge-attrs/>"
+    assert_compiles_to '<% _output(foo(merge_attrs({:a => "1"},(attributes) || {}), {})) %>', "<foo a='1' merge-attrs/>"
+  end
+
+
+  # --- Compilation: Defining Tags --- #
+
+  should "compile defs" do
+    assert_compiles_to(
+      "<% def foo(all_attributes={}, all_parameters={}); " +
+      "parameters = Hobo::Dryml::TagParameters.new(all_parameters, []); " +
+      "all_parameters = Hobo::Dryml::TagParameters.new(all_parameters); " +
+      "_tag_context(all_attributes) do attributes, = _tag_locals(all_attributes, []) %>" +
+      "<% _erbout; end; end %>",
+      
+      "<def tag='foo'></def>")
+      
+  end
+
+  should "compile attrs in defs as local variables" do
+    assert_compiles_to(
+      "<% def foo(all_attributes={}, all_parameters={}); " +
+      "parameters = Hobo::Dryml::TagParameters.new(all_parameters, []); " +
+      "all_parameters = Hobo::Dryml::TagParameters.new(all_parameters); " +
+      "_tag_context(all_attributes) do " +
+      "a, my_attr, attributes, = _tag_locals(all_attributes, [:a, :my_attr]) %>" +
+      "<% _erbout; end; end %>",
+      
+      "<def tag='foo' attrs='a, my-attr'></def>")
+  end
+
+  should "dissallow `param` outside of tag definitions" do
+    assert_raise(DrymlException) { compile_dryml("<foo param/>") }
+  end
+
+  should "compile param-tag calls as calls to `call_tag_parameter`" do
+    assert_compiles_to '<% _output(call_tag_parameter(:foo, {:a => "1"}, {}, all_parameters, :foo)) %>',  
+                       "<foo param a='1'/>",
+                       :in_def
+  end
+
+  should "compile with support for named params" do
+    assert_compiles_to "<% _output(call_tag_parameter(:foo, {}, {}, all_parameters, :zap)) %>", "<foo param='zap'/>", :in_def
+  end
+
+  should "compile a param tag-call with a body" do
+    assert_compiles_to "<% _output(call_tag_parameter(:foo, {}, { :default => proc { |_foo__default_content| new_context { %>abc<% } }, }, all_parameters, :foo)) %>",
+                       "<foo param>abc</foo>",
+                       :in_def
+  end
+
+  should "compile a param tag-call with a body and a call to <param_content/>" do
+    assert_compiles_to "<% _output(call_tag_parameter(:foo, {}, { :default => proc { |_foo__default_content| new_context { %>!!<%= _foo__default_content && _foo__default_content.call %>!!<% } }, }, all_parameters, :foo)) %>",
+                       "<foo param>!!<param-content/>!!</foo>",
+                       :in_def
+                       
+  end
+
+  should "compile param template-calls as calls to `call_tag_parameter`" do
+    assert_compiles_to "<% _output(call_tag_parameter(:foo, {}, {}, all_parameters, :foo)) %>",
+                       "<foo param/>",
+                       :in_def
+  end
+
+  should "compile param tag calls with parameters as calls to `call_tag_parameter`" do
+    assert_compiles_to '<% _output(call_tag_parameter(:foo, {}, {:a => proc { [{:x => "1"}, {}] }, }, all_parameters, :foo)) %>',
+                       "<foo param><a: x='1'/></foo>",
+                       :in_def
+  end
+
+  should "compile parameters with param" do
+    assert_compiles_to '<% _output(foo({}, {:abc => merge_tag_parameter(proc { [{}, {}] }, all_parameters[:abc]), })) %>',
+                       "<foo><abc: param/></foo>",
+                       :in_def
+  end
+
+  should "compile tag parameters with named params" do
+    assert_compiles_to '<% _output(foo({}, {:abc => merge_tag_parameter(proc { [{}, {}] }, all_parameters[:x]), })) %>', 
+                       "<foo><abc: param='x'/></foo>",
+                       :in_def
+  end
+
+  should "compile tag parameters with param and attributes" do
+    assert_compiles_to '<% _output(foo({}, {:abc => merge_tag_parameter(proc { [{:a => "b"}, {}] }, all_parameters[:x]), })) %>',
+                       "<foo><abc: param='x' a='b'/></foo>",
+                       :in_def
+  end
+
+  should "compile tag parameters with param and a tag body" do
+    assert_compiles_to(
+      '<% _output(foo({}, {:abc => merge_tag_parameter(' +
+      'proc { [{}, { :default => proc { |_abc__default_content| new_context { %>ha!<% } }, }] }, all_parameters[:abc]), })) %>',
+      "<foo><abc: param>ha!</abc></foo>",
+      :in_def)
+      
+  end
+
+  should "compile tag parameters with param and nested parameters" do
+    assert_compiles_to(
+      '<% _output(foo({}, {:baa => merge_tag_parameter(' +
+      'proc { [{}, {:x => proc { [{}, { :default => proc { |_x__default_content| new_context { %>hello<% } }, }] }, }] }, all_parameters[:baa]), })) %>',
+      "<foo><baa: param><x:>hello</x:></baa:></foo>",
+      :in_def)
+  end
+
+  # --- Compilation: Calling tags with parameters --- #
+
+  should "compile tag parameters as procs" do
+    assert_compiles_to(
+      '<% _output(foo({}, {' +
+      ':x => proc { [{}, { :default => proc { |_x__default_content| new_context { %>hello<% } }, }] }, ' +
+      ':y => proc { [{}, { :default => proc { |_y__default_content| new_context { %>world<% } }, }] }, })) %>',
+      "<foo><x:>hello</x><y:>world</y:></foo>"
+      )
+  end
+
+  should "compile tag parameters with attributes" do
+    assert_compiles_to(
+      '<% _output(foo({}, {:abc => proc { [{:x => "1"}, { :default => proc { |_abc__default_content| new_context { %>hello<% } }, }] }, })) %>',
+      "<foo><abc: x='1'>hello</abc></foo>"
+      )
+  end
+
+  should "allow :foo as a shorthand for field='foo' on template tags" do
+    assert_compiles_to '<% _output(foo({:field => "name"}, {})) %>', "<foo:name/>"
+  end
+
+  should "compile template parameters which are themselves templates" do
+    # Tag parameters with nested tag parameters are procs that return
+    # a pair of hashes, the first is the attributes, the second is the
+    # sub-template procs
+    assert_compiles_to(
+      '<% _output(foo({}, ' +
+      '{:baa => proc { [{:x => "1"}, {:a => proc { [{}, { :default => proc { |_a__default_content| new_context { %>hello<% } }, }] }, }] }, })) %>',
+      "<foo><baa: x='1'><a:>hello</a></baa></foo>")
+  end
+
+  should "compile 'replace' parameters" do
+    # A replace parameter is detected at runtime by the arity of the
+    # block == 1 (for a normal parameter it would be 0). See
+    # TemplateEnvironment#call_tag_parameter
+    assert_compiles_to(
+      '<% _output(page({}, {:head_replacement => proc { |_head_restore| new_context { %>abc<% } }, })) %>',
+      "<page><head: replace>abc</head></page>"
+      )
+  end
+
+  should "compile 'replace' parameters where the restore contains a default parameter call" do
+    assert_compiles_to(
+      '<% _output(page({}, {:head_replacement => proc { |_head_restore| new_context { %>abc ' +
+      '<% _output(_head_restore.call({}, { :default => proc { |_head__default_content| new_context { %>blah<% } }, })) %>' +
+      '<% } }, })) %>',
+      
+      "<page><head: replace>abc <head restore>blah</head></head></page>"
+      )
+  end
+
+  should "compile 'replace' tag parameters with a default parameter call" do
+    assert_compiles_to(
+      '<% _output(page({}, {:head_replacement => proc { |_head_restore| new_context { %>abc ' +
+      '<% _output(_head_restore.call({}, {})) %>' +
+      '<% } }, })) %>',
+      "<page><head: replace>abc <head restore/></head></page>")
+  end
+
+
+  # --- Compilation: Syntax sugar for before, after, append, prepend --- #
+
+  should "compile 'before' parameters" do
+    assert_compiles_to(
+      '<% _output(page({}, {:head_replacement => proc { |_head_restore| new_context { %>abc' +
+      '<% _output(_head_restore.call({}, {})) %>' +
+      '<% } }, })) %>',
+      "<page><before-head:>abc</before-head></page>")
+  end
+
+  should "compile 'after' parameters" do
+    assert_compiles_to(
+      '<% _output(page({}, {:head_replacement => proc { |_head_restore| new_context { %>' +
+      '<% _output(_head_restore.call({}, {})) %>' +
+      'abc<% } }, })) %>',
+      "<page><after-head:>abc</after-head></page>")
+  end
+
+  should "compile 'apppend' parameters" do
+    assert_compiles_to(
+      '<% _output(page({}, {:head => proc { [{}, { :default => proc { |_head__default_content| new_context { %>' +
+      '<%= _head__default_content && _head__default_content.call %>:o)' +
+      '<% } } } ] }, })) %>',
+      "<page><append-head:>:o)</append-head></page>")
+  end
+
+  should "compile 'prepend' parameters" do
+    assert_compiles_to(
+      '<% _output(page({}, {:head => proc { [{}, { :default => proc { |_head__default_content| new_context { %>' +
+      ':o)<%= _head__default_content && _head__default_content.call %>' +
+      '<% } } } ] }, })) %>',
+      "<page><prepend-head:>:o)</prepend-head></page>")
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Tom Locke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-08 00:00:00 +01:00
+date: 2008-09-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hobofields
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -38,7 +38,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: "2.1"
     version: 
@@ -52,16 +52,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: The web app builder for Rails
 email: tom@tomlocke.com
 executables: 
@@ -278,9 +268,9 @@ files:
 - tasks/fix_dryml.rake
 - tasks/generate_tag_reference.rb
 - tasks/hobo_tasks.rake
-- test/test_generator_helper.rb
-- test/test_helper.rb
-- test/test_hobo_model_controller_generator.rb
+- test/generators/test_generator_helper.rb
+- test/generators/test_helper.rb
+- test/generators/test_hobo_model_controller_generator.rb
 - uninstall.rb
 - hobo.gemspec
 has_rdoc: true
@@ -315,6 +305,7 @@ signing_key:
 specification_version: 2
 summary: The web app builder for Rails
 test_files: 
-- test/test_generator_helper.rb
-- test/test_helper.rb
-- test/test_hobo_model_controller_generator.rb
+- test/dryml/complilation_test.rb
+- test/generators/test_generator_helper.rb
+- test/generators/test_helper.rb
+- test/generators/test_hobo_model_controller_generator.rb