@@ -34,6 +34,12 @@ lib/hobo/dryml.rb lib/hobo/generator.rb lib/hobo/guest.rb lib/hobo/hobo_helper.rb +lib/hobo/lifecycles/actions.rb +lib/hobo/lifecycles/creator.rb +lib/hobo/lifecycles/lifecycle.rb +lib/hobo/lifecycles/state.rb +lib/hobo/lifecycles/transition.rb +lib/hobo/lifecycles.rb lib/hobo/model.rb lib/hobo/model_controller.rb lib/hobo/model_router.rb @@ -74,7 +80,6 @@ rails_generators/hobo_model_controller/hobo_model_controller_generator.rb rails_generators/hobo_model_controller/templates/controller.rb rails_generators/hobo_model_controller/templates/functional_test.rb rails_generators/hobo_model_controller/templates/helper.rb -rails_generators/hobo_model_controller/templates/view.html.erb rails_generators/hobo_model_controller/USAGE rails_generators/hobo_model_resource/hobo_model_resource_generator.rb rails_generators/hobo_model_resource/templates/controller.rb @@ -85,6 +90,8 @@ rails_generators/hobo_rapid/templates/hobo-rapid.css rails_generators/hobo_rapid/templates/hobo-rapid.js rails_generators/hobo_rapid/templates/IE7.js rails_generators/hobo_rapid/templates/lowpro.js +rails_generators/hobo_rapid/templates/nicedit.js +rails_generators/hobo_rapid/templates/nicEditorIcons.gif rails_generators/hobo_rapid/templates/reset.css rails_generators/hobo_rapid/templates/themes/clean/public/images/fieldbg.gif rails_generators/hobo_rapid/templates/themes/clean/public/images/pencil.png @@ -132,6 +139,8 @@ rails_generators/hobo_user_controller/templates/helper.rb rails_generators/hobo_user_controller/USAGE rails_generators/hobo_user_model/hobo_user_model_generator.rb rails_generators/hobo_user_model/templates/fixtures.yml +rails_generators/hobo_user_model/templates/forgot_password.erb +rails_generators/hobo_user_model/templates/mailer.erb rails_generators/hobo_user_model/templates/model.rb rails_generators/hobo_user_model/templates/unit_test.rb rails_generators/hobo_user_model/USAGE @@ -144,6 +153,8 @@ taglibs/rapid_document_tags.dryml taglibs/rapid_editing.dryml taglibs/rapid_forms.dryml taglibs/rapid_generics.dryml +taglibs/rapid_lifecycle_pages.dryml +taglibs/rapid_lifecycles.dryml taglibs/rapid_navigation.dryml taglibs/rapid_pages.dryml taglibs/rapid_plus.dryml hobo/Manifest @@ -64,7 +64,7 @@ end puts "\nGenerating Rails app...\n" opts = [] opts << "-d #{database_type}" if database_type -system("rails #{opts * ' '} #{app_path}") +system("rails _2.0.2_ #{opts * ' '} #{app_path}") Dir.chdir(app_path) do hobo/bin/hobo @@ -9,6 +9,9 @@ begin rescue MissingSourceFile # OK, Hobo won't do pagination then end +require "active_record" +require "action_controller" +require "action_view" # Monkey patches, ooh ooh require 'active_record/has_many_association' hobo/lib/hobo.rb @@ -9,7 +9,6 @@ require 'hobo/dryml/taglib' require 'hobo/dryml/tag_parameters' require 'hobo/dryml/template_environment' require 'hobo/dryml/template_handler' -require 'hobo/dryml/tag_extractor' module Hobo module Dryml hobo/lib/hobo/dryml.rb @@ -1,20 +1,22 @@ +%w[lifecycle actions creator state transition].each { |lib| require "hobo/lifecycles/#{lib}" } + module Hobo - + module Lifecycles - + class LifecycleError < RuntimeError; end class LifecycleKeyError < LifecycleError; end - + ModelExtensions = classy_module do - + attr_writer :lifecycle def self.lifecycle(*args, &block) options = args.extract_options! options = options.reverse_merge(:state_field => :state, :key_timestamp_field => :key_timestamp) - + if defined? self::Lifecycle lifecycle = self::Lifecycle else @@ -22,62 +24,62 @@ module Hobo lifecycle = self::Lifecycle lifecycle.init(self, options) end - + dsl = DeclarationDSL.new(lifecycle) dsl.instance_eval(&block) - + default = lifecycle.initial_state ? { :default => lifecycle.initial_state.name } : {} declare_field(options[:state_field], :string, default) - + declare_field(options[:key_timestamp_field], :datetime) - + never_show options[:state_field], options[:key_timestamp_field] attr_protected options[:state_field], options[:key_timestamp_field] end - - + + def self.has_lifecycle? defined?(self::Lifecycle) end - - + + def lifecycle @lifecycle ||= self.class::Lifecycle.new(self) end - - + + def become(state) self.lifecycle.state = state end - + end - - + + class DeclarationDSL - + def initialize(lifecycle) @lifecycle = lifecycle end - + def state(*names, &block) names.map {|name| @lifecycle.def_state(name, block) } end - + def initial_state(name, &block) s = @lifecycle.def_state(name, block) @lifecycle.initial_state = s end - + def create(who, name, options={}, &block) @lifecycle.def_creator(name, who, block, options) end - + def transition(who, name, change, options={}, &block) @lifecycle.def_transition(name, who, Array(change.keys.first), change.values.first, block, options) end - + def invariant(&block) @lifecycle.invariants << block end @@ -85,8 +87,8 @@ module Hobo def precondition(&block) @lifecycle.preconditions << block end - + end - + end end hobo/lib/hobo/lifecycles.rb @@ -1,15 +1,15 @@ module Hobo - + module Lifecycles - + class Lifecycle - + def self.init(model, options) @model = model @options = options reset end - + def self.reset @states = {} @creators = {} @@ -17,12 +17,12 @@ module Hobo @preconditions = [] @invariants = [] end - + class << self attr_accessor :model, :options, :states, :initial_state, :creators, :transitions, :invariants, :preconditions end - + def self.def_state(name, on_enter) name = name.to_s returning(State.new(name, on_enter)) do |s| @@ -30,12 +30,12 @@ module Hobo class_eval "def #{name}?; record.state == '#{name}'; end" end end - - + + def self.def_creator(name, who, on_create, options) name = name.to_s returning(Creator.new(self, name, who, on_create, options)) do |creator| - + class_eval %{ def self.#{name}(user, attributes=nil) create('#{name}', user, attributes) @@ -44,13 +44,13 @@ module Hobo can_create?('#{name}', user, attributes) end } - + end end - + def self.def_transition(name, who, start_state, end_states, on_transition, options) returning(Transition.new(self, name.to_s, who, start_state, end_states, on_transition, options)) do |t| - + class_eval %{ def #{name}(user, attributes=nil) transition('#{name}', user, attributes) @@ -59,96 +59,96 @@ module Hobo can_transition?('#{name}', user, attributes) end } - + end end - + def self.state_names states.keys end - - + + def self.can_create?(name, user, attributes=nil) creators[name.to_s].allowed?(user, attributes) end - - + + def self.create(name, user, attributes=nil) creators[name.to_s].run!(user, attributes) end - - + + def self.creator_names creators.keys end - - + + def self.transition_names transitions.*.name.uniq end - - + + def self.state_field options[:state_field] end - - + + # --- Instance Features --- # - + attr_reader :record - + attr_accessor :provided_key, :current_key - - + + def initialize(record) @record = record end - + def can_transition?(name, user, attributes=nil) available_transitions_for(user, name, attributes).any? end - - + + def transition(name, user, attributes=nil) transition = find_transition(name, user, attributes) transition.run!(record, user, attributes) end - + def find_transition(name, user, attributes=nil) - available_transitions_for(user, name, attributes).first or - raise LifecycleError, "No #{name} transition available to #{user} on this #{record.class.name}" + available_transitions_for(user, name, attributes).first or + raise LifecycleError, "No #{name} transition available to #{user} on this #{record.class.name}" end - - + + def state_name record.read_attribute self.class.state_field end - - + + def state self.class.states[state_name] end - - + + def available_transitions state.transitions_out end - - + + def available_transitions_for(user, name=nil, attributes=nil) matches = available_transitions matches = matches.select { |t| t.name == name.to_s } if name matches.select { |t| t.allowed?(record, user, attributes) } end - - + + def state=(state_name) state_name = state_name.to_s if self.state != state_name record.write_attribute self.class.state_field, state_name - + if state_name == "destroy" record.destroy else @@ -160,39 +160,39 @@ module Hobo end end end - - + + def key_timestamp_field record.class::Lifecycle.options[:key_timestamp_field] end - - + + def generate_key key_timestamp = Time.now record.write_attribute key_timestamp_field, key_timestamp current_key end - - + + def current_key require 'digest/sha1' Digest::SHA1.hexdigest("#{record.id}-#{state_name}-#{record.read_attribute key_timestamp_field}") end - + def valid_key? provided_key == current_key end - - + + def invariants_satisfied? self.class.invariants.all? { |i| record.instance_eval(&i) } end - + def preconditions_satisfied? self.class.preconditions.all? { |i| record.instance_eval(&i) } end - - end + + end end end hobo/lib/hobo/lifecycles/lifecycle.rb @@ -1,3 +1,5 @@ +require 'hobo/lifecycles' + module Hobo module Model hobo/lib/hobo/model.rb @@ -27,10 +27,10 @@ module Hobo before_filter :set_no_cache_headers rescue_from ActiveRecord::RecordNotFound, :with => :not_found - + rescue_from Hobo::Model::PermissionDeniedError, :with => :permission_denied rescue_from Hobo::Lifecycles::LifecycleKeyError, :with => :permission_denied - + alias_method_chain :render, :hobo_model end @@ -141,19 +141,12 @@ module Hobo collections.each { |c| def_collection_actions(c.to_sym) } def_lifecycle_actions end - - - def def_auto_action(name, &block) - define_method name, &block if name.not_in?(instance_methods) && include_action?(name) - end - def def_auto_action(name, &block) define_method name, &block if name.not_in?(instance_methods) && include_action?(name) end - def def_collection_actions(name) def_auto_action name do hobo_show_collection(name) @@ -169,19 +162,19 @@ module Hobo end end end - - + + def def_lifecycle_actions if model.has_lifecycle? model::Lifecycle.creator_names.each do |creator| - def_auto_action "#{creator}_page" do + def_auto_action "#{creator}_page" do creator_page_action creator end - def_auto_action creator do + def_auto_action creator do creator_action creator end end - + model::Lifecycle.transition_names.each do |transition| def_auto_action "#{transition}_page" do transition_page_action transition @@ -206,7 +199,7 @@ module Hobo end end - + def index_action(*names, &block) options = names.extract_options! index_actions.concat(names) @@ -223,7 +216,7 @@ module Hobo end end - + def publish_collection(*names) collections.concat(names) names.each {|n| def_collection_actions(n)} @@ -237,8 +230,8 @@ module Hobo def available_auto_actions (available_auto_read_actions + - available_auto_write_actions + - FORM_ACTIONS + + available_auto_write_actions + + FORM_ACTIONS + available_auto_collection_actions + available_auto_lifecycle_actions).uniq end @@ -263,8 +256,8 @@ module Hobo [c, "new_#{c.to_s.singularize}".to_sym, "create_#{c.to_s.singularize}".to_sym] end.flatten end - - + + def available_auto_lifecycle_actions # For each creator/transition there are two possible # actions. e.g. for signup, 'signup_page' would be routed to @@ -279,7 +272,7 @@ module Hobo end end # of ClassMethods - + protected @@ -505,9 +498,9 @@ module Hobo end end - + # --- Collection Actions --- # - + def hobo_show_collection(association, *args, &b) options = args.extract_options! association = find_instance.send(association) if association.is_a?(String, Symbol) @@ -541,7 +534,7 @@ module Hobo # --- Lifecycle Actions --- # - + def creator_action(name, &b) @creator = model::Lifecycle.creators[name.to_s] self.this = @creator.run!(current_user, attribute_parameters) @@ -553,42 +546,42 @@ module Hobo re_render_form(name) end end - - + + def creator_page_action(name) self.this = model.new @creator = model::Lifecycle.creators[name] dryml_fallback_tag "lifecycle_start_page" end - - + + def prepare_for_transition(name, options={}) self.this = find_instance this.exempt_from_edit_checks = true this.lifecycle.provided_key = params[:key] - @transition = this.lifecycle.find_transition(name, current_user) + @transition = this.lifecycle.find_transition(name, current_user) end - + def transition_action(name, *args, &b) prepare_for_transition(name) @transition.run!(this, current_user, attribute_parameters) - response_block(&b) or + response_block(&b) or if valid? redirect_to destination_after_submit else dryml_fallback_tag "lifecycle_transition_page" - re_render_form(name) + re_render_form(name) end end - + def transition_page_action(name, *args) options = args.extract_options! prepare_for_transition(name, options) dryml_fallback_tag "lifecycle_transition_page" end - + # --- Miscelaneous Actions --- # def hobo_completions(attribute, finder, options={}) hobo/lib/hobo/model_controller.rb @@ -4,36 +4,36 @@ module Hobo class << self def included(base) - base.class_eval do + base.class_eval do filter_parameter_logging "password" skip_before_filter :login_required, :only => [:login, :signup] - + include_taglib "rapid_user_pages", :plugin => "hobo" - + show_action :account - + alias_method_chain :hobo_update, :account_flash end end end - + def login; hobo_login; end - + def signup; hobo_signup; end - + def logout; hobo_logout; end - + def forgot_password; hobo_forgot_password; end - + def reset_password; hobo_reset_password; end - + private - + def hobo_login(options={}) login_attr = model.login_attribute.to_s.titleize.downcase options.reverse_merge!(:success_notice => "You have logged in.", :failure_notice => "You did not provide a valid #{login_attr} and password.") - + if request.post? user = model.authenticate(params[:login], params[:password]) if user.nil? @@ -41,7 +41,7 @@ module Hobo else old_user = current_user self.current_user = user - + # 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 @@ -62,7 +62,7 @@ module Hobo end end - + def hobo_signup(&b) creator_action(:signup) do response_block(&b) or if valid? @@ -73,7 +73,7 @@ module Hobo end end - + def hobo_logout(options={}) options = options.reverse_merge(:notice => "You have logged out.", :redirect_to => base_url) @@ -83,8 +83,8 @@ module Hobo flash[:notice] ||= options[:notice] redirect_back_or_default(options[:redirect_to]) unless performed? end - - + + def hobo_forgot_password if request.post? user = model.find_by_email_address(params[:email_address]) @@ -95,28 +95,28 @@ module Hobo render_tag :forgot_password_email_sent_page end end - - + + def hobo_reset_password(&b) transition_action :reset_password do response_block(&b) or if valid? self.current_user = this flash[:notice] = "Your password has been reset" - redirect_to home_page + redirect_to home_page end end end - - + + def hobo_update_with_account_flash(*args) hobo_update_without_account_flash(*args) do flash[:notice] = "Changes to your account were saved" if valid? && @this == current_user yield if block_given? end end - + private - + def logout_current_user if logged_in? current_user.forget_me @@ -125,7 +125,7 @@ module Hobo self.current_user = nil end end - + end - + end hobo/lib/hobo/user_controller.rb @@ -2,6 +2,7 @@ class <%= class_name %>Controller < ApplicationController hobo_model_controller + # changes require server restart auto_actions :all end hobo/rails_generators/hobo_model_controller/templates/controller.rb @@ -2,6 +2,7 @@ class <%= controller_class_name %>Controller < ApplicationController hobo_model_controller + # changes require server restart auto_actions :all end hobo/rails_generators/hobo_model_resource/templates/controller.rb @@ -18,9 +18,9 @@ def tag_title(tag, link=false) name = tag.attributes['tag'] anchor = tag_anchor(tag) end - + title = "<#{name}#{for_decl}>" - + if link "[#{title}](##{anchor})" else @@ -37,7 +37,7 @@ end def tag_anchor(element) for_attr = element.attributes['for'] name = element.attributes['tag'] - + if for_attr "#{name}--for-#{for_attr}" else @@ -47,17 +47,17 @@ end def comment_for_tag(element) - space = element.previous_sibling and + space = element.previous_sibling and space.to_s.blank? && space.to_s.count("\n") == 1 and comment = space.previous_sibling - + comment.to_s.strip if comment.is_a?(REXML::Comment) end def doc_for_tag(tagdef) comment = comment_for_tag(tagdef) - + params_merged_with = XPath.first(tagdef, ".//*[@merge|@merge-params]")._?.name params_merged_with &&= "(merged with #{link_to_tag params_merged_with})" @@ -66,7 +66,7 @@ def doc_for_tag(tagdef) attrs = tagdef.attributes['attrs'] || [] attrs = attrs.split(/,\s*/).where_not.blank?.map { |a| " * #{a}\n" }.join - + parameters = params_to_list(get_parameters(tagdef)) <<-END --- @@ -113,7 +113,7 @@ def params_to_list(params, indent=" ") sub_list = params_to_list(sub_params, indent + ' ') unless sub_params.empty? "<li>#{entry}\n#{sub_list}</li>\n" end.join - + items.any? ? "<ul>#{items}</ul>" : "" end @@ -125,8 +125,8 @@ end def doc_for_taglib(title, root) - tags = XPath.match(root, '/*/def').map { |e| doc_for_tag(e) }.join("\n\n") - + tags = XPath.match(root, '/*/def').map { |e| doc_for_tag(e) }.join("\n\n") + "# #{title}\n\n" + contents(root) + "\n\n" + tags end @@ -134,30 +134,30 @@ namespace :hobo do desc "Generate markdown formatted reference docs automatically from DRYML taglibs" task :generate_tag_reference do - + src = ENV['src'] - + output_dir = ENV['output'] || "taglib-docs" raise RuntimeError, "#{output_dir} is not a directory" if File.exists?(output_dir) && !File.directory?(output_dir) - + FileUtils.mkdir output_dir unless File.exists? output_dir - + dryml_files = File.directory?(src) ? Dir["#{src}/*"] : [src] - + dryml_files.each do |f| basename = File.basename(f).sub(/\.dryml$/, '') title = basename.titleize doc = Hobo::Dryml::Parser::Document.new(File.read(f), f) - + markdown = doc_for_taglib(title, doc) #html = Maruku.new(markdown).to_html - + output_file = "#{output_dir}/#{basename}.markdown" puts output_file File.open(output_file, 'w') { |f| f.write(markdown) } end end - + end - + hobo/tasks/generate_tag_reference.rb @@ -2,9 +2,9 @@ namespace :hobo do desc "Replace commonly used hobo assets with symlinks into the plugin so that they stay up to date" task :symlink_assets do - + Dir.chdir("#{RAILS_ROOT}/public") do - Dir.chdir("javascripts") do + Dir.chdir("javascripts") do puts "hobo-rapid.js" `rm -f hobo-rapid.js` `ln -s ../../vendor/plugins/hobo/rails_generators/hobo_rapid/templates/hobo-rapid.js` @@ -16,8 +16,8 @@ namespace :hobo do `ln -s ../../vendor/plugins/hobo/rails_generators/hobo_rapid/templates/themes/clean/public clean` end end - + end - + end - + hobo/tasks/hobo_tasks.rake @@ -4,11 +4,11 @@ Template = Hobo::Dryml::Template DrymlException = Hobo::Dryml::DrymlException describe Template do - + # --- Tag Compilation Examples --- # # --- Compilation: Calling Tags --- # - + it "should compile tag calls as method calls" do compile_dryml("<foo/>").should == "<% _output(foo.to_s) %>" end @@ -20,45 +20,45 @@ describe Template do it "should compile attributes as keyword parameters" do compile_dryml("<foo a='1' b='2'/>").should == '<% _output(foo({:a => "1", :b => "2"}, {})) %>' end - + it "should convert attribute names with dashes in tag calls to symbols with underscores" do compile_dryml("<foo my-attribute='1'/>").should == "<% _output(foo({:my_attribute => \"1\"}, {})) %>" end - it "should compile code attributes as ruby code" do + it "should compile code attributes as ruby code" do compile_dryml("<foo a='&1 + 2'/>").should == '<% _output(foo({:a => (1 + 2)}, {})) %>' end - - it "should compile attributes with no RHS as passing `true`" do + + it "should compile attributes with no RHS as passing `true`" do compile_dryml("<foo a/>").should == '<% _output(foo({:a => (true)}, {})) %>' end - - it "should compile content of a tag call as the default parameter" do + + it "should compile content of a tag call as the default parameter" do compile_dryml("<foo>the body</foo>").should == "<% _output(foo({}, { :default => proc { |_foo__default_content| new_context { %>the body<% } }, })) %>" end - - it "should support <param_content/> inside the content of a tag" do - compile_dryml("<foo>!!<param-content/>??</foo>").should == + + it "should support <param_content/> inside the content of a tag" do + compile_dryml("<foo>!!<param-content/>??</foo>").should == "<% _output(foo({}, { :default => proc { |_foo__default_content| new_context { %>!!<%= _foo__default_content && _foo__default_content.call %>??<% } }, })) %>" end - - it "should support the 'for' attribute on <param-content/>" do - compile_dryml("<x><y>123<param-content for='x'/>456</y></x>").should == + + it "should support the 'for' attribute on <param-content/>" do + compile_dryml("<x><y>123<param-content for='x'/>456</y></x>").should == "<% _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" + "<% } }, })) %><% } }, })) %>" end - - it "should allow :foo as a shorthand for field='foo' on tags" do + + it "should allow :foo as a shorthand for field='foo' on tags" do compile_dryml("<foo:name/>").should == '<% _output(foo({:field => "name"}, {})) %>' end - - it "should allow static tag names like :title as a shorthand for field='title'" do + + it "should allow static tag names like :title as a shorthand for field='title'" do compile_dryml("<foo:name/>").should == '<% _output(foo({:field => "name"}, {})) %>' end - - it "should allow close tags to ommit the :field_name part" do - compile_dryml("<foo:name></foo>").should == + + it "should allow close tags to ommit the :field_name part" do + compile_dryml("<foo:name></foo>").should == '<% _output(foo({:field => "name"}, { :default => proc { |_foo__default_content| new_context { %><% } }, })) %>' end @@ -66,107 +66,107 @@ describe Template do compile_dryml("<foo merge-attrs/>").should == "<% _output(foo(merge_attrs({},(attributes) || {}), {})) %>" compile_dryml("<foo a='1' merge-attrs/>").should == '<% _output(foo(merge_attrs({:a => "1"},(attributes) || {}), {})) %>' end - + # --- Compilation: Defining Tags --- # - - it "should compile defs" do - compile_def("<def tag='foo'></def>").should == + + it "should compile defs" do + compile_def("<def tag='foo'></def>").should == "<% 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, []) %>" + + "_tag_context(all_attributes) do attributes, = _tag_locals(all_attributes, []) %>" + "<% _erbout; end; end %>" end - - it "should compile attrs in defs as local variables" do - compile_def("<def tag='foo' attrs='a, my-attr'></def>").should == + + it "should compile attrs in defs as local variables" do + compile_def("<def tag='foo' attrs='a, my-attr'></def>").should == "<% 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]) %>" + + "a, my_attr, attributes, = _tag_locals(all_attributes, [:a, :my_attr]) %>" + "<% _erbout; end; end %>" end - - it "should dissallow `param` outside of tag definitions" do + + it "should dissallow `param` outside of tag definitions" do proc { compile_dryml("<foo param/>") }.should raise_error(DrymlException) end - - it "should compile param-tag calls as calls to `call_tag_parameter`" do + + it "should compile param-tag calls as calls to `call_tag_parameter`" do compile_in_template("<foo param a='1'/>").should == '<% _output(call_tag_parameter(:foo, {:a => "1"}, {}, all_parameters, :foo)) %>' end - - it "should compile with support for named params" do + + it "should compile with support for named params" do compile_in_template("<foo param='zap'/>").should == "<% _output(call_tag_parameter(:foo, {}, {}, all_parameters, :zap)) %>" end it "should compile a param tag-call with a body" do - compile_in_template("<foo param>abc</foo>").should == + compile_in_template("<foo param>abc</foo>").should == "<% _output(call_tag_parameter(:foo, {}, { :default => proc { |_foo__default_content| new_context { %>abc<% } }, }, all_parameters, :foo)) %>" end - - it "should compile a param tag-call with a body and a call to <param_content/>" do - compile_in_template("<foo param>!!<param-content/>!!</foo>").should == + + it "should compile a param tag-call with a body and a call to <param_content/>" do + compile_in_template("<foo param>!!<param-content/>!!</foo>").should == "<% _output(call_tag_parameter(:foo, {}, { :default => proc { |_foo__default_content| new_context { %>!!<%= _foo__default_content && _foo__default_content.call %>!!<% } }, }, all_parameters, :foo)) %>" end - it "should compile param template-calls as calls to `call_tag_parameter`" do - compile_in_template("<foo param/>").should == + it "should compile param template-calls as calls to `call_tag_parameter`" do + compile_in_template("<foo param/>").should == "<% _output(call_tag_parameter(:foo, {}, {}, all_parameters, :foo)) %>" end - - it "should compile param tag calls with parameters as calls to `call_tag_parameter`" do - compile_in_template("<foo param><a: x='1'/></foo>").should == + + it "should compile param tag calls with parameters as calls to `call_tag_parameter`" do + compile_in_template("<foo param><a: x='1'/></foo>").should == '<% _output(call_tag_parameter(:foo, {}, {:a => proc { [{:x => "1"}, {}] }, }, all_parameters, :foo)) %>' end - + it "should compile parameters with param" do - compile_in_template("<foo><abc: param/></foo>").should == + compile_in_template("<foo><abc: param/></foo>").should == '<% _output(foo({}, {:abc => merge_tag_parameter(proc { [{}, {}] }, all_parameters[:abc]), })) %>' end - + it "should compile tag parameters with named params" do - compile_in_template("<foo><abc: param='x'/></foo>").should == + compile_in_template("<foo><abc: param='x'/></foo>").should == '<% _output(foo({}, {:abc => merge_tag_parameter(proc { [{}, {}] }, all_parameters[:x]), })) %>' end - + it "should compile tag parameters with param and attributes" do - compile_in_template("<foo><abc: param='x' a='b'/></foo>").should == + compile_in_template("<foo><abc: param='x' a='b'/></foo>").should == '<% _output(foo({}, {:abc => merge_tag_parameter(proc { [{:a => "b"}, {}] }, all_parameters[:x]), })) %>' end - + it "should compile tag parameters with param and a tag body" do - compile_in_template("<foo><abc: param>ha!</abc></foo>").should == + compile_in_template("<foo><abc: param>ha!</abc></foo>").should == '<% _output(foo({}, {:abc => merge_tag_parameter(' + 'proc { [{}, { :default => proc { |_abc__default_content| new_context { %>ha!<% } }, }] }, all_parameters[:abc]), })) %>' end - - it "should compile tag parameters with param and nested parameters" do - compile_in_template("<foo><baa: param><x:>hello</x:></baa:></foo>").should == + + it "should compile tag parameters with param and nested parameters" do + compile_in_template("<foo><baa: param><x:>hello</x:></baa:></foo>").should == '<% _output(foo({}, {:baa => merge_tag_parameter(' + 'proc { [{}, {:x => proc { [{}, { :default => proc { |_x__default_content| new_context { %>hello<% } }, }] }, }] }, all_parameters[:baa]), })) %>' end - # --- Compilation: Calling tags with parameters --- # - - it "should compile tag parameters as procs" do + # --- Compilation: Calling tags with parameters --- # + + it "should compile tag parameters as procs" do compile_dryml("<foo><x:>hello</x><y:>world</y:></foo>").should == - '<% _output(foo({}, {' + + '<% _output(foo({}, {' + ':x => proc { [{}, { :default => proc { |_x__default_content| new_context { %>hello<% } }, }] }, ' + ':y => proc { [{}, { :default => proc { |_y__default_content| new_context { %>world<% } }, }] }, })) %>' end - + it "should compile tag parameters with attributes" do compile_dryml("<foo><abc: x='1'>hello</abc></foo>").should == '<% _output(foo({}, {:abc => proc { [{:x => "1"}, { :default => proc { |_abc__default_content| new_context { %>hello<% } }, }] }, })) %>' end - - it "should allow :foo as a shorthand for field='foo' on template tags" do + + it "should allow :foo as a shorthand for field='foo' on template tags" do compile_dryml("<foo:name/>").should == '<% _output(foo({:field => "name"}, {})) %>' end - - it "should compile template parameters which are themselves templates" do + + it "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 @@ -179,92 +179,92 @@ describe Template 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 - compile_dryml("<page><head: replace>abc</head></page>").should == + compile_dryml("<page><head: replace>abc</head></page>").should == '<% _output(page({}, {:head_replacement => proc { |_head_restore| new_context { %>abc<% } }, })) %>' end - + it "should compile 'replace' parameters where the restore contains a default parameter call" do - compile_dryml("<page><head: replace>abc <head restore>blah</head></head></page>").should == - + compile_dryml("<page><head: replace>abc <head restore>blah</head></head></page>").should == + '<% _output(page({}, {:head_replacement => proc { |_head_restore| new_context { %>abc ' + '<% _output(_head_restore.call({}, { :default => proc { |_head__default_content| new_context { %>blah<% } }, })) %>' + '<% } }, })) %>' end - + it "should compile 'replace' tag parameters with a default parameter call" do - compile_dryml("<page><head: replace>abc <head restore/></head></page>").should == - + compile_dryml("<page><head: replace>abc <head restore/></head></page>").should == + '<% _output(page({}, {:head_replacement => proc { |_head_restore| new_context { %>abc ' + '<% _output(_head_restore.call({}, {})) %>' + '<% } }, })) %>' end - - + + # --- Compilation: Syntax sugar for before, after, append, prepend --- # - + it "should compile 'before' parameters" do - compile_dryml("<page><before-head:>abc</before-head></page>").should == - + compile_dryml("<page><before-head:>abc</before-head></page>").should == + '<% _output(page({}, {:head_replacement => proc { |_head_restore| new_context { %>abc' + '<% _output(_head_restore.call({}, {})) %>' + '<% } }, })) %>' end - + it "should compile 'after' parameters" do - compile_dryml("<page><after-head:>abc</after-head></page>").should == - + compile_dryml("<page><after-head:>abc</after-head></page>").should == + '<% _output(page({}, {:head_replacement => proc { |_head_restore| new_context { %>' + '<% _output(_head_restore.call({}, {})) %>' + 'abc<% } }, })) %>' end - + it "should compile 'apppend' parameters" do - compile_dryml("<page><append-head:>:o)</append-head></page>").should == - - '<% _output(page({}, {:head => proc { [{}, { :default => proc { |_head__default_content| new_context { %>' + + compile_dryml("<page><append-head:>:o)</append-head></page>").should == + + '<% _output(page({}, {:head => proc { [{}, { :default => proc { |_head__default_content| new_context { %>' + '<%= _head__default_content && _head__default_content.call %>:o)' + '<% } } } ] }, })) %>' end it "should compile 'prepend' parameters" do - compile_dryml("<page><prepend-head:>:o)</prepend-head></page>").should == - - '<% _output(page({}, {:head => proc { [{}, { :default => proc { |_head__default_content| new_context { %>' + + compile_dryml("<page><prepend-head:>:o)</prepend-head></page>").should == + + '<% _output(page({}, {:head => proc { [{}, { :default => proc { |_head__default_content| new_context { %>' + ':o)<%= _head__default_content && _head__default_content.call %>' + '<% } } } ] }, })) %>' end # --- Tag Evalutation Examples --- # - - + + # --- Static Tags --- # - + it "should pass through tags declared as static" do "p".should be_in(Hobo.static_tags) eval_dryml("abc").should == "abc" eval_dryml("abc").should == "abc" end - - it "should pass through attributes with no rhs on static tags" do + + it "should pass through attributes with no rhs on static tags" do "p".should be_in(Hobo.static_tags) - eval_dryml("abc").should == "abc" + eval_dryml("abc").should == "abc" end - - it "should support attribute merging on static tags" do + + it "should support attribute merging on static tags" do eval_dryml(%( 'small', :id => 'y', :a => 'b'}"/>)). should be_dom_equal_to('') end - - it "should support attribute merging of all extra attributes on static tags" do + + it "should support attribute merging of all extra attributes on static tags" do eval_dryml(%(<def tag="x"></def> <x class='small' id='y' a='b'/>)). should be_dom_equal_to('') end - - + + # --- Tags without named parameters --- # - - + + def eval_with_defs(dryml) eval_dryml(<<-END + dryml).strip <def tag="do"><%= parameters.default %></def> @@ -279,43 +279,43 @@ describe Template do END end - it "should call tags" do + it "should call tags" do eval_with_defs("<t/>").should == "plain tag" end - + it "should call tags passing attributes" do eval_with_defs("<t-attr my-attr='10'/>").should == "it is 10" end - + it "should call tags with content (default parameter)" do eval_with_defs("<t-body>foo</t-body>").should == "( foo )" end - + it "should allow parameters to have a default" do eval_with_defs("<t-body/>").should == "( hmm )" end - + it "should provide access to the default parameter content" do eval_with_defs("<t-body>[<param-content/>]</t-body>").should == "( [hmm] )" end - - it "should support merge-attrs on static tags" do + + it "should support merge-attrs on static tags" do eval_with_defs('<merge-attrs-example class="x"/>').should == 'hi' end - - it "should make the declared attributes available via the 'attrs-for' method" do + + it "should make the declared attributes available via the 'attrs-for' method" do eval_with_defs('<%= attrs_for(:t_attr).inspect %>').should == '[:my_attr]' end - + it "should allow undeclared attributes to be extracted from 'attributes'" do eval_dryml("<def tag='t'><%= attributes[:my_attribute] %></def><t my-attribute='123'/>").should == "123" end - - - + + + # --- Parameters --- # - + def eval_with_templates(dryml) eval_dryml(<<-END + dryml).strip <def tag="do"><%= parameters.default %></def> @@ -336,83 +336,83 @@ describe Template do END end - it "should add attributes to static tags when merging" do - eval_with_templates("<static-merge><b: onclick='alert()'/></static-merge>").should == - 'a bold word' + it "should add attributes to static tags when merging" do + eval_with_templates("<static-merge><b: onclick='alert()'/></static-merge>").should == + 'a bold word' end - - it "should override attributes on static tags when merging" do - eval_with_templates("<static-merge><b: name='small'/></static-merge>").should == + + it "should override attributes on static tags when merging" do + eval_with_templates("<static-merge><b: name='small'/></static-merge>").should == 'a bold word' end - + it "should replace tag bodies on static tags when merging" do - eval_with_templates('<static-merge><b:>BOLD</static-merge>').should == + eval_with_templates('<static-merge><b:>BOLD</static-merge>').should == 'a BOLD word' end - - it "should add attributes to defined tags when merging" do + + it "should add attributes to defined tags when merging" do eval_with_templates('<def-tag-merge><defined: a="2"/></def-tag-merge>').should == 'foo a is 2, b is 3, body is baa!' end - - it "should override attributes on defined tags when merging" do + + it "should override attributes on defined tags when merging" do eval_with_templates('<def-tag-merge><defined: b="2"/></def-tag-merge>').should == 'foo a is , b is 2, body is baa!' end - - it "should replace tag bodies on defined tags when merging" do + + it "should replace tag bodies on defined tags when merging" do eval_with_templates('<def-tag-merge><defined:>zip</defined></def-tag-merge>').should == 'foo a is , b is 3, body is zip!' end - + it "should leave non-merged tags unchanged" do eval_with_templates('<static-merge></static-merge>').should == 'a bold word' end - + it "should merge into static tags with no body" do - eval_with_templates("<empty-static-merge><img: name='small'/></empty-static-merge>").should == + eval_with_templates("<empty-static-merge><img: name='small'/></empty-static-merge>").should == '<img name="small" src="..." />' end - - it "should merge template parameters into nested templates" do + + it "should merge template parameters into nested templates" do eval_with_templates('<nested-static-merge><static-merge:><b: name="small"/></static-merge></nested-static-merge>').should == 'merge StaticMerge: a bold word' end - - it "should merge the body of template parameters into nested templates" do + + it "should merge the body of template parameters into nested templates" do eval_with_templates('<nested-static-merge><static-merge:><b:>BOLD</static-merge></nested-static-merge>').should == 'merge StaticMerge: a BOLD word' end - - it "should allow param names to be defined dynamically" do + + it "should allow param names to be defined dynamically" do eval_dryml('<def tag="t"></def>' + '<t><ab: x="1"/></t>').should == '' end - - it "should allow params to be defined on other params" do - eval_with_templates('<parameter-merge><b: name="small">foo</parameter-merge>').should == + + it "should allow params to be defined on other params" do + eval_with_templates('<parameter-merge><b: name="small">foo</parameter-merge>').should == 'parameter merge: a foo word' end - - it "should allow parameter bodies to be restored with static tag params" do + + it "should allow parameter bodies to be restored with static tag params" do eval_with_templates("<static-merge><b:>very <param-content/></static-merge>").should == 'a very bold word' end - it "should allow parameter bodies to be restored with defined tag params" do + it "should allow parameter bodies to be restored with defined tag params" do eval_with_templates("<def-tag-merge><defined:>hum<param-content/></defined></def-tag-merge>").should == 'foo a is , b is 3, body is humbaa!' end - it "should insert the correct param-content in nested merged template parameters" do + it "should insert the correct param-content in nested merged template parameters" do eval_dryml("<def tag='t1'>t1 default</def>" + "<def tag='t2'><t1 merge><p: param><param-content/> - t2 default</t1></def>" + "<t2><p:><param-content/>!</t2>").should == "t1 default - t2 default!" end - - it "should accumulate attributes through nested merged template parameters" do + + it "should accumulate attributes through nested merged template parameters" do eval_dryml("<def tag='t1'><p: class='c1' c='c' param/></def>" + "<def tag='t2'><t1: merge/></def>" + "<def tag='t3'><t2: merge><p: class='c2' b='b' param/></t2></def>" + @@ -420,34 +420,34 @@ describe Template do end # --- Replacing Parameters --- # - - it "should allow template parameters to be replaced" do + + it "should allow template parameters to be replaced" do eval_with_templates('<static-merge><b: replace>short</static-merge>').should == 'a short word' end - - it "should allow template parameters to be replaced and then re-instated" do + + it "should allow template parameters to be replaced and then re-instated" do eval_with_templates('<nested-static-merge><static-merge: replace>Come back: <static-merge restore/></static-merge></nested-static-merge>').should == 'merge StaticMerge: Come back: a bold word' end - it "should allow template parameters to be replaced and then re-instated with different attributes" do + it "should allow template parameters to be replaced and then re-instated with different attributes" do eval_with_templates('<static-merge><b: replace>short </static-merge>').should == 'a short bold word' end - it "should allow template parameters to be replaced and then re-instated with different content" do + it "should allow template parameters to be replaced and then re-instated with different content" do eval_with_templates('<static-merge><b: replace>short big</static-merge>').should == 'a short big word' end - + it "should allow restored parameters to themselves be parameters" do eval_with_templates('<def tag="restore-param"><static-merge><b: replace>short big</static-merge></def>' + '<restore-param><b:>very big</b:></restore-param>'). should == 'a short very big word' end - it "should restore overridden parameters" do + it "should restore overridden parameters" do eval_dryml(%( <def tag='foo'><parameters.default/></def> <def tag='one'><foo param>a heading</foo></def> @@ -455,50 +455,50 @@ describe Template do <two><foo: replace><foo restore/></foo:></two> )).should == "new heading" end - - it "should restore overridden parameters on static tags" do + + it "should restore overridden parameters on static tags" do eval_dryml(%( <def tag='one'><h1 param>a heading</h1></def> <def tag='two'><one merge><h1: param>new heading</h1:></one></def> <two><h1: replace><h1 restore/></h1:></two> )).should == "<h1>new heading</h1>" end - + # --- Append, Prepend, Before & After --- # - it "should allow content to be inserted before template parameters" do + it "should allow content to be inserted before template parameters" do eval_with_templates('<static-merge><before-b:>:o)</before-b></static-merge>').should == 'a :o)bold word' end - - it "should allow content to be inserted after template parameters" do + + it "should allow content to be inserted after template parameters" do eval_with_templates('<static-merge><after-b:>:o)</after-b></static-merge>').should == 'a bold:o) word' end - - it "should allow content to be prepended to the content of template parameters" do + + it "should allow content to be prepended to the content of template parameters" do eval_with_templates('<static-merge><prepend-b:>:o)</prepend-b></static-merge>').should == 'a :o)bold word' end - it "should allow content to be appended to the content of template parameters" do + it "should allow content to be appended to the content of template parameters" do eval_with_templates('<static-merge><append-b:>:o)</append-b></static-merge>').should == 'a bold:o) word' end - + # --- Merge Params --- # - - + + it "should support merge_param on template calls" do tags = %(<def tag="page"><h1 param='title'/><div param='footer'/></def> <def tag="my-page"><page merge-params><footer:>the footer</footer></page></def>) eval_dryml(tags + "<my-page><title:>Hi!</title></my-page>").should == '<h1>Hi!</h1><div>the footer</div>' end - - + + # --- Polymorphic Tags --- # - + it "should allow tags to be selected based on types" do tags = %(<def tag="do"><%= parameters.default %></def> <def tag="t" for="string">A string</def> @@ -507,124 +507,124 @@ describe Template do eval_dryml(tags + '<do with="&\'foo\'"><%= call_polymorphic_tag(:t) %></do>').should == "A string" eval_dryml(tags + '<do with="&false"><%= call_polymorphic_tag(:t) %></do>').should == "A boolean" end - + # --- The Context --- # - + def context_eval(context, src) eval_dryml(src, :context => context) end - + def a_user Struct.new(:name, :email).new("Tom", "tom@foo.net") end - + def show_tag '<def tag="show"><%= this %></def>' end - - it "should make the initial context available as `this`" do + + it "should make the initial context available as `this`" do context_eval('hello', "<%= this %>").should == "hello" end - - it "should allow the context to be changed with the :<field-name> syntax" do + + it "should allow the context to be changed with the :<field-name> syntax" do context_eval(a_user, show_tag + '<show:name/>').should == "Tom" end - - it "should allow the :<field-name> to be ommitted from the close tag" do + + it "should allow the :<field-name> to be ommitted from the close tag" do context_eval(a_user, show_tag + '<show:name></show:name>').should == "Tom" context_eval(a_user, show_tag + '<show:name></show>').should == "Tom" end - - - it "should allow the context to be changed with a 'with' attribute" do + + + it "should allow the context to be changed with a 'with' attribute" do eval_dryml(show_tag + %(<show with="&'hello'"/>)).should == 'hello' end - - it "should allow the context to be changed with a 'field' attribute" do + + it "should allow the context to be changed with a 'field' attribute" do context_eval(a_user, show_tag + '<show field="name"/>').should == "Tom" end - - it "should allow the context to be changed inside template parameters" do + + it "should allow the context to be changed inside template parameters" do tags = %(<def tag="do"><%= parameters.default %></def> <def tag="template"><do:name></do></def>) context_eval(a_user, tags + '<template><p:><%= this %></p:></template>').should == 'Tom' end - + # --- <set> --- # - + it "should provide <set> to create local variables" do eval_dryml("<set x='&1' y='&2'/><%= x + y %>").should == '3' end - + it "should support assignment to dotted names with <set>" do eval_dryml("<set s='&Struct.new(:a).new'/><set s.a='&10'/><%= s.a %>").should == '10' end - - it 'should interpolate #{...} blocks in attributes of any tag' do + + it 'should interpolate #{...} blocks in attributes of any tag' do tag = '<def tag="t" attrs="x"><%= x %></def>' - + eval_dryml(tag + "<t x='#{1+2}'/>").should == '3' eval_dryml(tag + "<t x='hey #{1+2} ho'/>").should == 'hey 3 ho' eval_dryml(tag + "").should == "" eval_dryml(tag + "").should == "" end - - + + # --- <set_scoped> --- # - - it "should support scoped variables" do + + it "should support scoped variables" do tags = - "<def tag='t1'><set-scoped my-var='ping'><%= parameters.default %></set-scoped></def>" + + "<def tag='t1'><set-scoped my-var='ping'><%= parameters.default %></set-scoped></def>" + "<def tag='t2'><set-scoped my-var='pong'><%= parameters.default %></set-scoped></def>" eval_dryml(tags + "<t1><%= scope.my_var %></t1>").should == 'ping' eval_dryml(tags + "<t1><t2><%= scope.my_var %></t2> <%= scope.my_var %></t1>").should == 'pong ping' end - + # --- Taglibs --- # - - it "should import tags from taglibs with the <include> tag" do + + it "should import tags from taglibs with the <include> tag" do eval_dryml("<include src='taglibs/simple'/> <foo/>").should == "I am the foo tag" end - - it "should import tags from taglibs into a namespace with <include as/>" do + + it "should import tags from taglibs into a namespace with <include as/>" do proc { eval_dryml("<include src='taglibs/simple' as='a'/> <foo/>") }.should raise_error eval_dryml("<include src='taglibs/simple' as='a'/> <a.foo/>").should == "I am the foo tag" end - - + + # --- Control Attributes --- # - - it "should alow static tags to be conditional with the 'if' attribute" do + + it "should alow static tags to be conditional with the 'if' attribute" do eval_dryml("").should == "" eval_dryml("").should == "" eval_dryml("hello").should == "" eval_dryml("hello").should == "hello" end - - it "should alow static tags to be repeated with the 'repeat' attribute" do - eval_dryml('<img repeat="&[1,2,3]" src="#{this}" />').should == + + it "should alow static tags to be repeated with the 'repeat' attribute" do + eval_dryml('<img repeat="&[1,2,3]" src="#{this}" />').should == '<img src="1" /><img src="2" /><img src="3" />' - + # Make sure <%= %> doesn't break - eval_dryml('<img repeat="&[1,2,3]" src="<%= this %>" />').should == + eval_dryml('<img repeat="&[1,2,3]" src="<%= this %>" />').should == '<img src="1" /><img src="2" /><img src="3" />' end - - it "should alow defined tags to be repeated with the 'repeat' attribute" do + + it "should alow defined tags to be repeated with the 'repeat' attribute" do eval_dryml('<def tag="t"><%= this %></def><t repeat="&[1,2,3]"/>').should == '123' end it "should allow <else> to be used with the if attribute" do eval_dryml("<%= Hobo::Dryml.last_if %>").should == "false" end - - + + # --- Whitespace Suppression --- # - -# it "should remove allow newlines to be removed by adding a ' -' at the end of a line" do + +# it "should remove allow newlines to be removed by adding a ' -' at the end of a line" do # src = <<-END #<def tag="t"> - # My Tag - @@ -633,22 +633,22 @@ describe Template do #END # eval_dryml(src).should == "My Tag" # end - - + + # --- Testing for parameters --- # - - it "should be possible to test for the presence of a parameter with parameters.foo?" do + + it "should be possible to test for the presence of a parameter with parameters.foo?" do tag = "<def tag='t'><%= parameters.foo? ? 'y' : 'n' %></def>" eval_dryml(tag + "<t/>").should == "n" eval_dryml(tag + "<t><foo:/></t>").should == "y" end - + # --- Test Helpers --- # - + def prepare_template(src, options) options.reverse_merge!(:template_path => "TEST") - + Hobo::Dryml::Template.clear_build_cache @env = Class.new(Hobo::Dryml::TemplateEnvironment) template = Template.new(src, @env, options[:template_path]) @@ -656,16 +656,16 @@ describe Template do template.instance_variable_set("@builder", options[:builder]) if options[:builder] template end - - + + def eval_dryml(src, options={}) options.reverse_merge!(:locals => {}, :implicit_imports => []) - + template = prepare_template(src, options) template.compile(options[:locals].keys, options[:implicit_imports]) new_renderer.render_page(options[:context], options[:locals]).strip end - + def compile_dryml(src, options={}) template = prepare_template(src, options) CompiledDryml.new(template.process_src) @@ -678,34 +678,34 @@ describe Template do def compile_in_template(src) builder = mock("builder", :null_object => true) def_src = nil - builder.should_receive(:add_build_instruction) do |type, args| + builder.should_receive(:add_build_instruction) do |type, args| def_src = args[:src] end compile_dryml("<def tag='MyTemplate'>#{src}</def>", :builder => builder) - + # get rid of first and last scriptlets - they're to do with the method declaration def_src.to_s.sub(/^\<\%.*?\%\>/, "").sub(/<% _erbout; end; end %><% _register_tag_attrs.*$/, "") end - + def compile_def(src) builder = mock("builder", :null_object => true) def_src = nil - builder.should_receive(:add_build_instruction) do |type, args| + builder.should_receive(:add_build_instruction) do |type, args| def_src = args[:src] end compile_dryml(src, :builder => builder) - + def_src.sub(/<% _register_tag_attrs.*/, "") end - + end class CompiledDryml < String - + def ==(other) self.to_s.gsub(/\s+/, ' ').strip == other.gsub(/\s+/, ' ').strip end - + end @@ -716,23 +716,23 @@ module Spec def initialize(expected) @expected = expected end - + def matches?(actual) @actual = actual expected_dom = HTML::Document.new(@expected).root actual_dom = HTML::Document.new(@actual).root expected_dom == actual_dom end - + def failure_message "#{@expected}\nexpected to be == (by DOM) to\n#{@actual}" end - + def description "be DOM equal to\n#{@expected}" end end - + def be_dom_equal_to(expected) Matchers::BeDomEqualTo.new(expected) end hobo_spec/unit/hobo/dryml/template_spec.rb hobo/lib/hobo/dryml/tag_extractor.rb db40016dd01ecd7b6254589e15be10b5269d34e4 0553a982671f81ead5fab9190a211f1afe2cc2a9 Tom Locke tom@tomlocke.com http://github.com/tablatom/hobo/commit/fbad60018d6c91faeb60b682adadf723cc550a58 fbad60018d6c91faeb60b682adadf723cc550a58

2008-06-13T11:14:56-07:00

Merge branch 'drnic' Fixed conflicts in: hobo/lib/hobo/dryml.rb hobo/lib/hobo/model_controller.rb 76d08f14fc66287afe94711b9d10f4667431e7e2 Tom Locke tom@tomlocke.com