malline 1.0.2

data/lib/malline/view_proxy.rb

@@ -0,0 +1,54 @@
+# Copyright © 2007,2008 Riku Palomäki
+#
+# This file is part of Malline.
+#
+# Malline is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Malline is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Malline.  If not, see <http://www.gnu.org/licenses/>.
+
+module Malline
+	class ViewProxy
+		def initialize template, tag
+			@tpl = template
+			@tag = tag
+		end
+
+		def __yld &block
+			@tpl.execute @tag[:children], &block
+		end
+
+		def method_missing(s, *args, &block)
+			if args.last.is_a?(Hash)
+				@tag[:attrs].merge!(args.pop)
+			end
+
+			if /\!$/ =~ s.to_s
+				@tag[:attrs]['id'] = s.to_s.chomp('!')
+			else
+				if @tag[:attrs]['class']
+					@tag[:attrs]['class'] << " #{s}"
+				else
+					@tag[:attrs]['class'] = s.to_s
+				end
+			end
+
+			whitespace = @tpl.whitespace
+			@tpl.whitespace = true if args.delete(:whitespace)
+			txt = args.flatten.join('')
+			@tag[:children] << txt unless txt.empty?
+
+			@tpl.execute @tag[:children], &block if block_given?
+			@tpl.whitespace = whitespace
+			self
+		end
+	end
+end

data/lib/malline/view_wrapper.rb

@@ -0,0 +1,91 @@
+# Copyright © 2007,2008 Riku Palomäki
+#
+# This file is part of Malline.
+#
+# Malline is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Malline is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Malline.  If not, see <http://www.gnu.org/licenses/>.
+
+module Malline
+	module ViewWrapper
+		attr_accessor :malline_is_active
+
+		# List of all methods that may override some custom view methods
+		# If is_malline?, then their _malline_ -prefix versions are called
+		@@malline_methods = %w{_erbout cache capture _ tag! << txt!}
+
+		def init_malline_methods
+			@malline_methods_inited = true
+			@@malline_methods.each do |m|
+				mf = m.gsub('<', 'lt')
+				eval %{def #{m}(*x, &b) is_malline? ? _malline_#{mf}(*x, &b) : super; end}
+			end
+		end
+
+		def malline opts = nil
+			if @malline
+				@malline.options.merge!(opts) if opts.is_a?(Hash)
+			else
+				@malline = Template.new(self, opts)
+			end
+			init_malline_methods unless @malline_methods_inited
+			@malline
+		end
+		
+		def _malline__erbout
+			@_erbout ||= ErbOut.new(self)
+		end
+
+		def _malline_cache name = {}, options = {}, &block
+			return block.call unless @controller.perform_caching
+			cache = @controller.read_fragment(name, options)
+
+			unless cache
+				cache = _malline_capture { block.call }
+				@controller.write_fragment(name, cache, options)
+			end
+			@malline.add_unescaped_text cache
+		end
+
+		def _malline_capture &block
+			@malline.run &block
+		end
+
+		def _malline__ *args
+			@malline.add_text(*args)
+		end
+		alias_method :_malline_txt!, :_malline__
+
+		def _malline_ltlt *args
+			@malline.add_unescaped_text *args
+		end
+
+		def method_missing s, *args, &block
+			return super unless is_malline?
+			helper = (s.to_s[0].chr == '_') ? s.to_s[1..255].to_sym : s.to_sym
+			if respond_to?(helper)
+				@malline.helper(helper, *args, &block)
+			else
+				return super if @malline.options[:strict]
+				_malline_tag! s, *args, &block
+			end
+		end
+
+		def _malline_tag! *args, &block
+			@malline.tag *args, &block
+		end
+
+		def is_malline?
+			@malline_is_active
+		end
+	end
+end

data/lib/malline/view_xhtml.rb

@@ -0,0 +1,71 @@
+# Copyright © 2007,2008 Riku Palomäki
+#
+# This file is part of Malline.
+#
+# Malline is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Malline is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Malline.  If not, see <http://www.gnu.org/licenses/>.
+
+module Malline::XHTML
+	CUSTOM_TAGS = %w{head title meta}
+
+	# grep ELEMENT xhtml1-transitional.dtd | cut -d' ' -f2 | tr "\n" " "
+	XHTML_TAGS = %w{html head title base meta link style script noscript iframe
+		noframes body div p h1 h2 h3 h4 h5 h6 ul ol menu dir li dl dt dd address
+		hr pre blockquote center ins del a span bdo br em strong dfn code samp
+		kbd var cite abbr acronym q sub sup tt i b big small u s strike basefont
+		font object param applet img map area form label input select optgroup
+		option textarea fieldset legend button isindex table caption thead tfoot
+		tbody colgroup col tr th td} - CUSTOM_TAGS
+
+	# grep 'ELEMENT.*EMPTY' xhtml1-transitional.dtd | cut -d' ' -f2 | tr "\n" " "
+	SHORT_TAG_EXCLUDES = XHTML_TAGS + CUSTOM_TAGS - %w{base meta link hr br
+		basefont param img area input isindex col}
+
+	module Tags
+	 	def xhtml *args, &block
+			attrs = { :xmlns => 'http://www.w3.org/1999/xhtml', 'xml:lang' => malline.options[:lang] }
+			attrs.merge!(args.pop) if args.last.is_a?(Hash)
+
+			self << "<?xml version=\"1.0\" encoding=\"#{malline.options[:encoding] || 'UTF-8'}\"?>\n"
+			self << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 #{malline.options[:xhtml_dtd] || 'Transitional'}//EN\"\n"
+			self << "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-#{(malline.options[:xhtml_dtd] || 'Transitional').downcase}.dtd\">\n"
+
+			tag! 'html', args.join(''), attrs, &block
+		end
+
+		def title *args, &block
+			@__xhtml_title = true
+			tag! 'title', *args, &block
+		end
+
+		def meta *args, &block
+			@__xhtml_meta = true
+			tag! 'meta', *args, &block
+		end
+
+		def head *args, &block
+			@__xhtml_title = false
+			proxy = tag! 'head', *args, &block
+			proxy.__yld { title } unless @__xhtml_title
+			proxy.__yld do
+				meta :content => "text/html; charset=#{malline.options[:encoding] || 'UTF-8'}", 'http-equiv' => 'Content-Type'
+			end unless @__xhtml_meta
+		end
+	end
+
+	def self.load_plugin base
+		base.definetags *XHTML_TAGS
+		base.view.malline.short_tag_excludes += SHORT_TAG_EXCLUDES
+		base.view.extend Tags
+	end
+end

data/scripts/html2mn.rb

@@ -0,0 +1,93 @@
+#!/usr/bin/env ruby
+# Copyright © 2007,2008 Riku Palomäki
+#
+# This file is part of Malline.
+#
+# Malline is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Malline is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Malline.  If not, see <http://www.gnu.org/licenses/>.
+
+require "rexml/document"
+include REXML
+
+def html_unescape str
+	str.to_s.gsub('&amp;', '&').gsub('&quot;', '"').gsub('&gt;', '>').gsub('&lt;', '<')
+end
+
+def esc str
+	if str =~ /["#]/ || !(str =~ /'/)
+		"'"+(str.split("'").join("\\'"))+"'"
+	else
+		"\"#{str}\""
+	end
+end
+
+def attributes element
+	element.attributes.keys.collect {|k| "#{esc k} => #{esc html_unescape(element.attributes[k])}" }.join(', ')
+end
+
+def txtize txt
+	#txt.gsub(/(\s)\s*$/, '\1').gsub(/^(\s)\s*/, '\1')
+	txt.gsub(/\s*$/, '').gsub(/^\s*/, '')
+end
+
+def convert element, prefix=''
+	valid_method = /^[A-Za-z][\w_]*$/
+	output = ''
+	if element.is_a?(Array)
+		element.each {|e| output << convert(e) }
+	elsif element.is_a?(Element)
+		output << prefix << element.name
+		attrs = []
+		element.attributes['class'].to_s.split.uniq.each do |cl|
+			if valid_method =~ cl
+				output << ".#{cl}"
+			else
+				attrs << cl
+			end
+		end
+		element.attributes.delete('class')
+		element.attributes['class'] = attrs.join(' ') unless attrs.empty?
+		if element.attributes['id'].to_s =~ valid_method
+			output << ".#{element.attributes['id']}!"
+			element.attributes.delete('id')
+		end
+		txt = ''
+		children = element.children
+		unless children.empty?
+			if children.first.is_a?(Text)
+				txt = txtize children.shift.to_s
+				output << " #{esc html_unescape(txt)}" unless txt.empty?
+			end
+		end
+
+		output << (txt.empty? ? ' ' : ', ') << attributes(element) if element.has_attributes?
+		unless children.empty?
+			output << " do\n"
+			children.each {|e| output << convert(e, prefix + "\t") }
+			output << prefix << "end"
+		end
+		output << "\n"
+	elsif element.is_a?(Text)
+		txt = txtize(element.to_s)
+		output << prefix << "txt! #{esc html_unescape(txt)}\n" unless txt.empty?
+	end
+	output
+end
+
+input = File.open(ARGV.shift, 'r') rescue $stdin
+output = File.open(ARGV.shift, 'w') rescue $stdout
+
+doc = Document.new input
+
+
+output.puts convert(doc.children)

data/test/examples/_action.mn

@@ -0,0 +1,4 @@
+@title = 'Data'
+ul.data! do
+	3.times {|i| li "Data #{i}" }
+end

data/test/examples/_action.target

@@ -0,0 +1 @@
+<ul id="data"><li>Data 0</li><li>Data 1</li><li>Data 2</li></ul>

data/test/examples/_one.mn

@@ -0,0 +1 @@
+span.one 'This is the first'

data/test/examples/_one.target

@@ -0,0 +1 @@
+<span class="one">This is the first</span>

data/test/examples/_partial.mn

@@ -0,0 +1,2 @@
+# This is just a stupid partial
+div 'I always thought something was fundamentally wrong with the universe.'

data/test/examples/_partial.target

@@ -0,0 +1 @@
+<div>I always thought something was fundamentally wrong with the universe.</div>

data/test/examples/_three.rhtml

@@ -0,0 +1,2 @@
+Blop, <%= 'this is rhtml'.upcase %>.
+<%= render :partial => 'examples/two' %>

data/test/examples/_two.mn

@@ -0,0 +1 @@
+img :src => image_path('second')

data/test/examples/_two.target

@@ -0,0 +1 @@
+<img src="/images/img"/>

data/test/examples/capture.mn

@@ -0,0 +1,13 @@
+div do
+	@foo = capture do
+		div do
+			img :src => '/images/image.png'
+			br
+			span.caption 'Taken at the location of the event'
+		end
+	end
+
+	h4 'Captured'
+	self << @foo
+	_'EOF'
+end

data/test/examples/capture.target

@@ -0,0 +1 @@
+<div><h4>Captured</h4><div><img src="/images/image.png"/><br/><span class="caption">Taken at the location of the event</span></div>EOF</div>

data/test/examples/class.mn

@@ -0,0 +1,6 @@
+# These two things are the same
+div :class => 'page'
+div.page
+
+# You can even give more than one class
+div.foo.bar.many

data/test/examples/class.target

@@ -0,0 +1 @@
+<div class="page"></div><div class="page"></div><div class="foo bar many"></div>

data/test/examples/escape.mn

@@ -0,0 +1,4 @@
+p 'Do you know, that 2 < 5?', :title => '2 < 5'
+p do
+	_'Me & Myself & Malline'
+end

data/test/examples/escape.target

@@ -0,0 +1 @@
+<p title="2 &lt; 5">Do you know, that 2 &lt; 5?</p><p>Me &amp; Myself &amp; Malline</p>

data/test/examples/fragment_cache.mn

@@ -0,0 +1,10 @@
+div do
+	cache "stuff" do
+		# This block is evaluated only if no cache with keyword stuff is found
+		# After evaluation the block is saved to cache
+		# If caching is not enabled, the cache block is transparent
+		h4 'Some partial stuff'
+		_render :partial => 'examples/partial'
+	end
+	_'dynamic content'
+end

data/test/examples/fragment_cache.target

@@ -0,0 +1 @@
+<div><h4>Some partial stuff</h4><div>I always thought something was fundamentally wrong with the universe.</div>dynamic content</div>

data/test/examples/frontpage.mn

@@ -0,0 +1,6 @@
+div.page do
+	h1 'Header one'
+	ul.list! do
+		li { a 'Link to somewhere', :href => '/foo' }
+	end
+end

data/test/examples/frontpage.target

@@ -0,0 +1 @@
+<div class="page"><h1>Header one</h1><ul id="list"><li><a href="/foo">Link to somewhere</a></li></ul></div>

data/test/examples/hello_world.mn

@@ -0,0 +1,2 @@
+# Lets say hello to the world
+div 'Hello world', :title => 'Hello'

data/test/examples/hello_world.target

@@ -0,0 +1 @@
+<div title="Hello">Hello world</div>

data/test/examples/helper.mn

@@ -0,0 +1,5 @@
+def rot13 name
+	'<div>' + (name.tr "A-Za-z", "N-ZA-Mn-za-m") + '</div>'
+end
+
+self << rot13('secret stuff')

data/test/examples/helper.target

@@ -0,0 +1 @@
+<div>frperg fghss</div>

data/test/examples/helper2.mn

@@ -0,0 +1,5 @@
+def rot13 name
+	div name.tr("A-Za-z", "N-ZA-Mn-za-m")
+end
+
+rot13('frperg fghss')

data/test/examples/helper2.target

@@ -0,0 +1 @@
+<div>secret stuff</div>

data/test/examples/helper_shortcut.mn

@@ -0,0 +1,5 @@
+p do
+	# These two do exactly the same
+	self << link_to('Frontpage', '/')
+	_link_to('Frontpage', '/')
+end

data/test/examples/helper_shortcut.target

@@ -0,0 +1 @@
+<p>linklink</p>

data/test/examples/id.mn

@@ -0,0 +1,3 @@
+# id:s are given by shouting loud enough
+div.page!
+div.foo.page!.bar