lib/markaby/rails/action_controller_helpers.rb lib/markaby/rails/template_handler.rb markaby.gemspec test/app_root/app/controllers/application_controller.rb test/app_root/app/controllers/markaby_controller.rb test/app_root/app/helpers/test_helper.rb test/app_root/app/views/markaby/_monkeys.mab test/app_root/app/views/markaby/broken.mab test/app_root/app/views/markaby/create.mab test/app_root/app/views/markaby/index.mab test/app_root/app/views/markaby/multiple_forms.mab test/app_root/config/boot.rb test/app_root/config/database.yml test/app_root/config/environment.rb test/app_root/config/environments/in_memory.rb test/app_root/config/environments/mysql.rb test/app_root/config/environments/postgresql.rb test/app_root/config/environments/sqlite.rb test/app_root/config/environments/sqlite3.rb test/app_root/config/routes.rb test/app_root/lib/console_with_fixtures.rb test/app_root/log/in_memory.log test/app_root/script/console test/markaby_controller_test.rb test/markaby_test.rb test/monkeys.html test/test_helper.rb @@ -1,42 +1,49 @@ require 'rake' require 'rake/testtask' -require 'rake/clean' -require 'rake/gempackagetask' require 'rake/rdoctask' -require 'tools/rakehelp' -require 'fileutils' -include FileUtils +require 'rcov/rcovtask' -REV = File.read(".svn/entries")[/committed-rev="(\d+)"/, 1] rescue nil -VERS = ENV['VERSION'] || "0.5" + (REV ? ".#{REV}" : "") +begin + require 'jeweler' -task :default => [:package] - -setup_tests -setup_rdoc ['README', 'CHANGELOG', 'lib/**/*.rb'] + Jeweler::Tasks.new do |s| + s.name = "markaby" + s.summary = "Markaby is a very short bit of code for writing HTML pages in pure Ruby." + s.email = "dinsley@gmail.com " + s.homepage = "http://github.com/dinsley/markaby" + s.description = "Markaby is a very short bit of code for writing HTML pages in pure Ruby." + s.authors = ["Tim Fletcher", "why_", "Daniel Insley"] + end +rescue LoadError + puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" +end -summary = "Markup as Ruby, write HTML in your native Ruby tongue" -test_file = "test/test_markaby.rb" -setup_gem("markaby", VERS, "Tim Fletcher and _why", summary, [['builder', '>=2.0.0']], test_file) +task :test do + Rake::TestTask.new do |t| + t.libs << 'lib' + t.pattern = ['test/markaby_test.rb'] + t.verbose = false + end -desc "List any Markaby specific warnings" -task :warnings do - `ruby -w test/test_markaby.rb 2>&1`.split(/\n/).each do |line| - next unless line =~ /warning:/ - next if line =~ /builder-/ - puts line + Rake::TestTask.new do |t| + t.libs << 'lib' + t.pattern = ['test/markaby_controller_test.rb'] + t.verbose = false end end -desc "Start a Markaby-aware IRB session" -task :irb do - sh 'irb -I lib -r markaby -r markaby/kernel_method' +Rake::RDocTask.new do |rdoc| + rdoc.rdoc_dir = 'rdoc' + rdoc.title = 'Jeweler' + rdoc.options << '--line-numbers' << '--inline-source' + rdoc.rdoc_files.include('README*') + rdoc.rdoc_files.include('lib/**/*.rb') end -namespace :test do - desc '' - task :rails do - Dir.chdir '../../../' - sh 'rake test:plugins PLUGIN=markaby' - end -end \ No newline at end of file +Rcov::RcovTask.new do |t| + t.libs << "test" + t.test_files = FileList['markaby_test.rb', 'test/markaby_controller_test.rb'] + t.verbose = true +end + +task :default => :test \ No newline at end of file Rakefile @@ -1,4 +1,4 @@ --- :minor: 0 -:patch: 0 +:patch: 5 :major: 0 VERSION.yml @@ -1,8 +1,8 @@ -$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'lib')) +#$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'lib')) require 'markaby' -require 'markaby/rails' +require 'markaby/rails/template_handler' +require 'markaby/rails/action_controller_helpers' -ActionView::Template.register_template_handler 'mab', Markaby::Rails::ActionViewTemplateHandler - -ActionController::Base.send :include, Markaby::Rails::ActionControllerHelpers +ActionView::Template.register_template_handler 'mab', Markaby::Rails::TemplateHandler +ActionController::Base.send :include, Markaby::Rails::ActionControllerHelpers \ No newline at end of file init.rb @@ -16,12 +16,10 @@ $:.unshift File.expand_path(File.dirname(__FILE__)) # * Markaby::MetAid: metaprogramming helper methods. # * Markaby::Tags: lists the roles of various XHTML tags to help Builder # use these tags as they are intended. -# * Markaby::Template: a class for hooking Markaby into Rails as a -# proper templating language. module Markaby VERSION = '0.5' - class InvalidXhtmlError < Exception; end + class InvalidXhtmlError < StandardError; end end unless defined?(Builder) @@ -32,4 +30,10 @@ end require 'markaby/builder' require 'markaby/cssproxy' require 'markaby/metaid' -require 'markaby/template' + +module Kernel + # Shortcut for creating a quick block of Markaby. + def mab(*args, &block) + Markaby::Builder.new(*args, &block).to_s + end +end \ No newline at end of file lib/markaby.rb @@ -1,22 +1,22 @@ require 'markaby/tags' module Markaby - # The Markaby::Builder class is the central gear in the system. When using + # The Markaby::Builder class is the central gear in the system. When using # from Ruby code, this is the only class you need to instantiate directly. # - # mab = Markaby::Builder.new - # mab.html do - # head { title "Boats.com" } - # body do - # h1 "Boats.com has great deals" - # ul do - # li "$49 for a canoe" - # li "$39 for a raft" - # li "$29 for a huge boot that floats and can fit 5 people" - # end - # end - # end - # puts mab.to_s + # mab = Markaby::Builder.new + # mab.html do + # head { title "Boats.com" } + # body do + # h1 "Boats.com has great deals" + # ul do + # li "$49 for a canoe" + # li "$39 for a raft" + # li "$29 for a huge boot that floats and can fit 5 people" + # end + # end + # end + # puts mab.to_s # class Builder @@ -36,30 +36,30 @@ module Markaby @@default[option] = value end - def self.ignored_helpers - @@ignored_helpers ||= [] - end - - def self.ignore_helpers(*helpers) - ignored_helpers.concat helpers - end + def self.ignored_helpers + @@ignored_helpers ||= [] + end + + def self.ignore_helpers(*helpers) + ignored_helpers.concat helpers + end attr_accessor :output_helpers, :tagset - # Create a Markaby builder object. Pass in a hash of variable assignments to + # Create a Markaby builder object. Pass in a hash of variable assignments to # +assigns+ which will be available as instance variables inside tag construction - # blocks. If an object is passed in to +helpers+, its methods will be available + # blocks. If an object is passed in to +helpers+, its methods will be available # from those same blocks. # # Pass in a +block+ to new and the block will be evaluated. # - # mab = Markaby::Builder.new { - # html do - # body do - # h1 "Matching Mole" - # end - # end - # } + # mab = Markaby::Builder.new { + # html do + # body do + # h1 "Matching Mole" + # end + # end + # } # def initialize(assigns = {}, helpers = nil, &block) @streams = [[]] @@ -70,7 +70,7 @@ module Markaby @@default.each do |k, v| instance_variable_set("@#{k}", @assigns.delete(k) || v) end - + @assigns.each do |k, v| instance_variable_set("@#{k}", v) end @@ -80,7 +80,7 @@ module Markaby text(capture(&block)) if block end - # Returns a string containing the HTML stream. Internally, the stream is stored as an Array. + # Returns a string containing the HTML stream. Internally, the stream is stored as an Array. def to_s @streams.last.to_s end @@ -93,11 +93,11 @@ module Markaby alias_method :<<, :text alias_method :concat, :text - # Captures the HTML code built inside the +block+. This is done by creating a new + # Captures the HTML code built inside the +block+. This is done by creating a new # stream for the builder object, running the block and passing back its stream as a string. # - # >> Markaby::Builder.new.capture { h1 "TEST"; h2 "CAPTURE ME" } - # => "<h1>TITLE</h1>\n<h2>CAPTURE ME</h2>\n" + # >> Markaby::Builder.new.capture { h1 "TEST"; h2 "CAPTURE ME" } + # => "<h1>TITLE</h1>\n<h2>CAPTURE ME</h2>\n" # def capture(&block) @streams.push(@builder.target = []) @@ -119,11 +119,11 @@ module Markaby raise InvalidXhtmlError, "no element `#{tag}' for #{tagset.doctype}" elsif args.last.respond_to?(:to_hash) attrs = args.last.to_hash - + if @tagset.forms.include?(tag) and attrs[:id] attrs[:name] ||= attrs[:id] end - + attrs.each do |k, v| atname = k.to_s.downcase.intern unless k =~ /:/ or @tagset.tagset[tag].include? atname @@ -149,18 +149,18 @@ module Markaby end # This method is used to intercept calls to helper methods and instance - # variables. Here is the order of interception: + # variables. Here is the order of interception: # # * If +sym+ is a helper method, the helper method is called - # and output to the stream. + # and output to the stream. # * If +sym+ is a Builder::XmlMarkup method, it is passed on to the builder object. # * If +sym+ is also the name of an instance variable, the - # value of the instance variable is returned. + # value of the instance variable is returned. # * If +sym+ has come this far and no +tagset+ is found, +sym+ and its arguments are passed to tag! # * If a tagset is found, though, +NoMethodError+ is raised. # # method_missing used to be the lynchpin in Markaby, but it's no longer used to handle - # HTML tags. See html_tag for that. + # HTML tags. See html_tag for that. def method_missing(sym, *args, &block) if @helpers.respond_to?(sym, true) && !self.class.ignored_helpers.include?(sym) r = @helpers.send(sym, *args, &block) @@ -179,7 +179,7 @@ module Markaby instance_variable_get(ivar) elsif !@helpers.nil? && @helpers.instance_variables.include?(ivar) @helpers.instance_variable_get(ivar) - elsif ::Builder::XmlMarkup.instance_methods.include?(sym.to_s) + elsif ::Builder::XmlMarkup.instance_methods.include?(sym.to_s) @builder.__send__(sym, *args, &block) elsif @tagset.nil? tag!(sym, *args, &block) @@ -188,8 +188,8 @@ module Markaby end end - # Every HTML tag method goes through an html_tag call. So, calling <tt>div</tt> is equivalent - # to calling <tt>html_tag(:div)</tt>. All HTML tags in Markaby's list are given generated wrappers + # Every HTML tag method goes through an html_tag call. So, calling <tt>div</tt> is equivalent + # to calling <tt>html_tag(:div)</tt>. All HTML tags in Markaby's list are given generated wrappers # for this method. # # If the @auto_validation setting is on, this method will check for many common mistakes which @@ -206,15 +206,15 @@ module Markaby XHTMLTransitional.tags.each do |k| class_eval %{ - def #{k}(*args, &block) - html_tag(#{k.inspect}, *args, &block) - end - } +def #{k}(*args, &block) +html_tag(#{k.inspect}, *args, &block) +end +} end remove_method :head - - # Builds a head tag. Adds a <tt>meta</tt> tag inside with Content-Type + + # Builds a head tag. Adds a <tt>meta</tt> tag inside with Content-Type # set to <tt>text/html; charset=utf-8</tt>. def head(*args, &block) tag!(:head, *args) do @@ -223,8 +223,8 @@ module Markaby end end - # Builds an html tag. An XML 1.0 instruction and an XHTML 1.0 Transitional doctype - # are prepended. Also assumes <tt>:xmlns => "http://www.w3.org/1999/xhtml", + # Builds an html tag. An XML 1.0 instruction and an XHTML 1.0 Transitional doctype + # are prepended. Also assumes <tt>:xmlns => "http://www.w3.org/1999/xhtml", # :lang => "en"</tt>. def xhtml_transitional(attrs = {}, &block) self.tagset = Markaby::XHTMLTransitional @@ -261,8 +261,8 @@ module Markaby end - # Every tag method in Markaby returns a Fragment. If any method gets called on the Fragment, - # the tag is removed from the Markaby stream and given back as a string. Usually the fragment + # Every tag method in Markaby returns a Fragment. If any method gets called on the Fragment, + # the tag is removed from the Markaby stream and given back as a string. Usually the fragment # is never used, though, and the stream stays intact. # # For a more practical explanation, check out the README. @@ -285,5 +285,5 @@ module Markaby class XmlMarkup < ::Builder::XmlMarkup attr_accessor :target, :level end - -end + +end \ No newline at end of file lib/markaby/builder.rb CHANGELOG lib/markaby/kernel_method.rb lib/markaby/rails.rb lib/markaby/template.rb setup.rb test/rails/markaby/_monkeys.mab test/rails/markaby/broken.mab test/rails/markaby/create.mab test/rails/markaby/index.mab test/rails/monkeys.html test/rails/test_helper.rb test/rails/test_preamble.rb test/rails_test.rb test/test_markaby.rb tools/rakehelp.rb 7a96a7c58f673613cc008f6b96fd191631f261e1 Daniel Insley dan@viviti.com http://github.com/dinsley/markaby/commit/0ad0ca7aa21462fe8777f19ec4bd9484256c1172 0ad0ca7aa21462fe8777f19ec4bd9484256c1172 2009-04-24T10:06:37-07:00 2009-04-24T10:06:37-07:00 cleaned up the gem and added some specs for a double form problem thats happening 6e8ea9355b1bbe41f641f7b0c15ebc58d175e3bb Daniel Insley dan@viviti.com