use new api for rendering templates

Author: jreidinger

examples/slim_properties.rb

@@ -1,6 +1,7 @@
 $: << File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 require 'ui'
-require 'ui/builder/slim'
+
+include UI::Template
 
 template =<<EOF
 main_dialog
@@ -10,5 +11,5 @@
     push_button HStretch=false Ok
 EOF
 
-dialog = UI.slim(template, self)
+dialog = render text: template
 dialog.wait_for_event

examples/slim_template.rb

@@ -1,7 +1,8 @@
 $: << File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 require 'ui'
-require 'ui/builder/slim'
+require 'ui/template'
 
+include UI::Template
 template =<<EOF
 main_dialog
   vbox
@@ -10,5 +11,5 @@
     push_button Ok
 EOF
 
-dialog = UI.slim(template, self)
+dialog = render text: template
 dialog.wait_for_event

examples/slim_template_from_file.rb

@@ -1,11 +1,12 @@
 $: << File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 require 'ui'
-require 'ui/builder/slim'
+
+include UI::Template
 
 TEMPLATE_FILE = File.expand_path("../wizard1.uit",__FILE__)
 TEMPLATE_FILE2 = File.expand_path("../wizard2.uit",__FILE__)
 
-dialog = UI.slim(File.read(TEMPLATE_FILE), self)
+dialog = render file: TEMPLATE_FILE
 puts dialog.id
 puts dialog[:Enabled]
 puts dialog.properties.inspect
@@ -15,6 +16,6 @@
 map[:first] = dialog.find_widget(:i1)[:Value]
 map[:second] = dialog.find_widget(:i2)[:Value]
 dialog.destroy!
-dialog2 = UI.slim(File.read(TEMPLATE_FILE2),:context => map)
+dialog2 = render file: TEMPLATE_FILE2, context: map
 dialog2.wait_for_event
 puts dialog2.id

examples/slim_template_test.rb

@@ -1,6 +1,7 @@
 $: << File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 require 'ui'
-require 'ui/builder/slim'
+
+include UI::Template
 
 template =<<EOF
 main_dialog
@@ -17,7 +18,7 @@
     push_button id=1 activated=Proc.new{|event,dialog| event.widget[:Label] = event.widget[:Label]+"!";false} Ok
 EOF
 
-dialog = UI.slim(template, binding)
+dialog = render text: template
 event = dialog.wait_for_event
 puts event.inspect
 event.widget[:Label] = "No longer OK"

examples/slim_template_with_loops.rb

@@ -1,6 +1,7 @@
 $: << File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 require 'ui'
-require 'ui/builder/slim'
+
+include UI::Template
 
 template =<<EOF
 main_dialog
@@ -14,5 +15,5 @@
     push_button Ok
 EOF
 
-dialog = UI.slim(template, self)
+dialog = render text: template
 dialog.wait_for_event

examples/user.rb

@@ -1,9 +1,8 @@
 $: << File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 require 'ui'
-require 'ui/builder/slim'
 
-EDIT_DIALOG_TEMPLATE = File.read(File.expand_path("../user_edit.yui",__FILE__))
-SHOW_DIALOG_TEMPLATE = File.read(File.expand_path("../users.yui",__FILE__))
+EDIT_DIALOG_TEMPLATE = File.expand_path("../user_edit.yui",__FILE__)
+SHOW_DIALOG_TEMPLATE = File.expand_path("../users.yui",__FILE__)
 
 class User
   ATTRS = [ :first_name, :surname, :hair, :skill, :beer ]
@@ -15,8 +14,10 @@ def initialize
   end
 end
 
+include UI::Template
+
 def edit_user user
-  dialog = UI.slim(EDIT_DIALOG_TEMPLATE, user)
+  dialog = render file: EDIT_DIALOG_TEMPLATE, context: user
   dialog.find(:clear).activated do |event,dialog|
     User::ATTRS.each { |a| dialog.find(a)[:Value] = "" }
     false
@@ -51,7 +52,7 @@ def add_user_to_dialog user,parent
 
 def show_users users
   @users = users
-  dialog = UI.slim(SHOW_DIALOG_TEMPLATE, self)
+  dialog = render file: SHOW_DIALOG_TEMPLATE
   dialog.find(:save).activated do |event,dialog|
     path = UI.ask_for_existing_file Dir.pwd,"target File"
     puts users.to_json

lib/ui.rb

@@ -6,6 +6,7 @@
 require 'ui/widget'
 require 'ui/item'
 require 'ui/selection_widget'
+require 'ui/template'
 
 module UI
 
@@ -82,4 +83,4 @@ def self.replace(id, &block)
     current_dialog.replace(id, &block)
   end
 
-end
+end

lib/ui/builder/slim.rb lib/ui/template.rb

@@ -9,8 +9,7 @@
 require 'pp'
 
 module UI
-  module Builder
-
+  module Template
     # This module allows to build user interfaces
     # using slim templates (http://www.slim-lang.org)
     #
@@ -160,7 +159,7 @@ def parse_attributes attrs
 
         def on_slim_tag(name, attrs, body)
           attrs_str = parse_attributes attrs
-          if LEAF_ELEMENTS.include?(name.to_sym)
+          if Builder::LEAF_ELEMENTS.include?(name.to_sym)
             attrs_str.prepend ", " unless attrs_str.empty?
             body = compile(body)
             if body.empty?
@@ -171,7 +170,7 @@ def on_slim_tag(name, attrs, body)
               body,
               [:dynamic, attrs_str + "\n"]
             ]
-          elsif (CONTAINER_ELEMENTS+TOPLEVEL_ELEMENTS).include?(name.to_sym)
+          elsif (Builder::CONTAINER_ELEMENTS+Builder::TOPLEVEL_ELEMENTS).include?(name.to_sym)
             attrs_str = "("+attrs_str+")" unless attrs_str.empty?
 
             [ :multi, 
@@ -200,18 +199,25 @@ class Engine < Temple::Engine
       end
 
     end
-  end
-end
 
-module UI
+    # Builds a widget/dialog using a slim template
+    # mandatory part of options is either :file or :text key that
+    # specify template
+    # 
+    # {include:file:examples/slim_template.rb}
+    def render(options={})
+      raise "specify template to render by file: or text: key" if !options[:file] && !options[:text]
+      io = options.delete(:text) || File.read(options.delete(:file))
+
+      options[:context] ||= self
+
+      code = UI::Template::Slim::Engine.new(options).call(io)
+      File.write("/tmp/ui.log", code)
+      puts options.inspect
+      options[:context].extend UI::Builder
+      options[:context].instance_eval code
+    end
 
-  # Builds a widget/dialog using a slim template
-  # 
-  # {include:file:examples/slim_template.rb}
-  def self.slim(io, context, options={})
-    code = UI::Builder::Slim::Engine.new(options).call(io)
-    File.write("/tmp/ui.log", code)
-    context.extend UI::Builder
-    context.instance_eval code
   end
 end
+