app/views/render_test/_clock.xaml app/views/render_test/clock.html.erb vendor/plugins/silverline/client/app_render_rb.rb @@ -8,6 +8,14 @@ <string>app\views\posts\_posts.rb</string> <key>app.rb</key> <string>..\vsl\Merlin\Users\jimmysch\dynamic_silverlight\photoviewer\ruby\app.rb</string> + <key>body.</key> + <string>vendor\plugins\silverline\templates\body.html.erb</string> + <key>dis</key> + <string>vendor\rails\actionpack\lib\action_controller\dispatcher.rb</string> + <key>dispatch</key> + <string>vendor\rails\railties\lib\dispatcher.rb</string> + <key>dispatcher</key> + <string>vendor\rails\actionpack\lib\action_controller\dispatcher.rb</string> <key>generator.rb</key> <string>vendor\plugins\silverline\lib\silverline\essential\generator.rb</string> <key>index.</key> .eprj .gitignore README Rakefile @@ -1,7 +1,4 @@ class RenderTestController < ApplicationController layout "posts" - def test_action_xaml - render :action => "test_action_xaml" - end end app/controllers/render_test_controller.rb @@ -15,4 +15,4 @@ </tr> <% end %> </table> -<% end %> \ No newline at end of file +<% end %> app/views/posts/_posts.html.erb @@ -1,10 +1,30 @@ -require 'silverlight' - -class Posts < SilverlightApplication - def start - @posts = get "posts", :format => 'ruby' - render :partial => "posts/posts", :update => "posts" - end +download "/posts.json" do |s, a| + @posts = JSON.new.parse(a.result) + render :partial => "posts/posts", :update => "posts" end -Posts.new.start +#get "posts", :format => 'ruby' +#render_posts :update => "posts" + +def render_posts(options = {}) + id, posts = options[:update], @posts + if @posts.empty? + output = "No posts! Add one below!" + else + output = "<table>" + output += " <tr>" + posts.first.keys.each do |key| + output += " <th>#{key}</th>" + end + output += " </tr>" + posts.each do |post| + output += " <tr>" + post.keys.each do |key| + output += " <td>#{post[key]}</td>" + end + output += " </tr>" + end + output += "</table>" + end + document.send(id)[:innerHTML] = output +end app/views/posts/_posts.rb @@ -1,3 +1,3 @@ <%= render :partial => "test_xaml", :properties => { :width => "640", :height => "480" -} %> \ No newline at end of file +} %> app/views/render_test/test_xaml.html.erb config/boot.rb config/database.yml config/environment.rb config/environments/development.rb config/environments/production.rb config/environments/test.rb config/initializers/inflections.rb config/initializers/mime_types.rb config/routes.rb db/migrate/001_create_posts.rb db/schema.rb doc/README_FOR_APP log/production.log log/server.log log/test.log public/ironruby/Chiron.exe @@ -19,7 +19,7 @@ <add key="urlPrefix" value="http://example.com/assemblies/" /> --> - <add key="urlPrefix" value="/ironruby" /> + <add key="urlPrefix" value="/ironruby" />  <add key="localAssemblyPath" value="." /> public/ironruby/Chiron.exe.config public/ironruby/IronRuby.Libraries.dll public/ironruby/IronRuby.dll public/ironruby/Microsoft.Scripting.Core.dll public/ironruby/Microsoft.Scripting.Silverlight.dll public/ironruby/Microsoft.Scripting.dll test/fixtures/posts.yml test/functional/posts_controller_test.rb test/functional/render_test_controller_test.rb test/test_helper.rb test/unit/post_test.rb vendor/plugins/footnotes-edge/init.rb vendor/plugins/footnotes-edge/lib/textmate_backtracer.rb vendor/plugins/footnotes-edge/lib/textmate_footnotes.rb vendor/plugins/footnotes-edge/lib/textmate_initialize.rb vendor/plugins/footnotes-edge/templates/rescues/template_error.erb vendor/plugins/footnotes-edge/test/mock_controller.rb vendor/plugins/footnotes-edge/test/textmate_footnotes_test.rb @@ -1,2 +1,6 @@ require 'silverlight' -SilverlightApplication.use_xaml :name => $PARAMS[:xaml_to_render] \ No newline at end of file + +options = {:name => $PARAMS[:xaml_to_render]} +options[:type] = Inflection.constantize($PARAMS[:xaml_type]) unless $PARAMS[:xaml_type].nil? + +SilverlightApplication.use_xaml options vendor/plugins/silverline/client/app_render_xaml.rb @@ -21,22 +21,20 @@ class Teleport < SilverlightApplication private def find_client_links - $app.puts params[:client_links] - $app.puts @client_links.inspect - titles = @client_links.collect { |l| puts l.keys.inspect; l.fetch("title") } - $app.puts titles.inspect + # TODO: FIX THIS HACK! it should be l['title'] in the block! + titles = @client_links.collect { |l| l.values.last } + t = document.get_elements_by_tag_name("a")[1].title.to_s document.get_elements_by_tag_name("a").select { - |a| titles.include?(a.title) && a.rel == "silverlight".to_clr_string + |a| titles.include?(a.title.to_s) && a.rel.to_s == "silverlight" } end def hook_client_link(a) - $app.puts "hooking stuff" - link = @client_links.select{ |l| l['title'] == a[:title] }.first - $app.puts "hooking stuff" + # TODO: FIX THIS HACK! it should be l['title'] == a.title.to_s in the block! + link = @client_links.select{ |l| l.values.last == a.title.to_s }.first unless link.nil? - $app.puts "hooking stuff" - a.onclick { |s, e| do_action(link['options']) } + # TODO: FIX THIS HACK! it should be link['options'] in do_action + a.onclick { |s, e| do_action(link.values.first) } a.remove_attribute("title") end end @@ -47,8 +45,9 @@ class Teleport < SilverlightApplication controller = ClientController c = controller.new c.host = self - c.send(options['url']['action']) + # TODO: FIX THIS HACK! it should be c.send options["url"]["action"] + c.send(options.values.first.values.first) end end -Teleport.new \ No newline at end of file +Teleport.new vendor/plugins/silverline/client/app_teleport.rb @@ -47,4 +47,4 @@ class SilverlightApplication rhtml = ERB.new XAP.get_file_contents("views/#{partial}.html.erb") document.send(options[:update])[:innerHTML] = rhtml.result(binding) end -end \ No newline at end of file +end vendor/plugins/silverline/client/lib/application.rb @@ -2,5 +2,5 @@ require 'lib/helpers/debug' require 'lib/helpers/downloader' require 'lib/helpers/html' require 'lib/helpers/wpf' -require 'lib/helpers/json_beta1' -require 'lib/helpers/xap' \ No newline at end of file +require 'lib/helpers/json' +require 'lib/helpers/xap' vendor/plugins/silverline/client/lib/helpers.rb @@ -5,27 +5,27 @@ module Debug end module ClassMethods - def puts(msg) - if document.debug_print.nil? - div = document.create_element('div') - div[:id] = "debug_print" - document.get_elements_by_tag_name("body").get_Item(0).append_child(div) - end - document.debug_print[:innerHTML] = "#{document.debug_print.innerHTML}<hr />#{msg}" - end - - def debug_puts(msg) - self.puts(msg) if $DEBUG - end + def puts(msg) + if document.debug_print.nil? + div = document.create_element('div') + div[:id] = "debug_print" + document.get_elements_by_tag_name("body").get_Item(0).append_child(div) + end + document.debug_print[:innerHTML] = "#{document.debug_print.innerHTML}<hr />#{msg}" + end + + def debug_puts(msg) + self.puts(msg) if $DEBUG + end end module InstanceMethods - def puts(msg) - self.class.puts(msg) - end - - def debug_puts(msg) - self.class.debug_puts(msg) - end + def puts(msg) + self.class.puts(msg) + end + + def debug_puts(msg) + self.class.debug_puts(msg) + end end -end \ No newline at end of file +end vendor/plugins/silverline/client/lib/helpers/debug.rb @@ -3,7 +3,7 @@ include System::Windows::Browser module Downloader def download(url, &block) - if block.nil? + unless block_given? request = HtmlPage.Window.CreateInstance("XMLHttpRequest".to_clr_string) request.Invoke("open".to_clr_string, "GET".to_clr_string, url, false) request.Invoke("send".to_clr_string, "".to_clr_string) @@ -16,9 +16,11 @@ module Downloader end def get(url, options, &block) - json = download "/#{url}.json" + url = "/#{url}.json" + return download url, block if block_given? + json = download url return JSON.new.parse(json) if options[:format] == 'ruby' return json end -end \ No newline at end of file +end vendor/plugins/silverline/client/lib/helpers/downloader.rb @@ -15,6 +15,21 @@ class HtmlDocument end end +class HtmlElementCollection + def [](index) + get_Item(index) + end + def size + count + end + def first + self[0] if size > 0 + end + def last + self[size - 1] if size > 0 + end +end + class HtmlElement def [](index) val = get_attribute(index) @@ -96,4 +111,4 @@ class HtmlStyle return style unless style.nil? raise e end -end \ No newline at end of file +end vendor/plugins/silverline/client/lib/helpers/html/patch.rb @@ -1,5 +1,16 @@ class JSON - AST = Struct.new(:value) + + # TODO: Use Struct when it works properly + # AST = Struct.new(:value) + class AST + def initialize(value) + @value = value + end + def value + @value + end + end + # /endTODO def parse(input) @input = StringScanner.new(input) @@ -109,4 +120,4 @@ class JSON raise "#{message}: #{@input.peek(@input.string.length)}" end end -end \ No newline at end of file +end vendor/plugins/silverline/client/lib/helpers/json.rb @@ -1,6 +1,7 @@ require 'lib/helpers/wpf/builders' require 'lib/helpers/wpf/patch' require 'lib/helpers/wpf/animation' +require 'lib/patch.rb' # for Inflection include System::Windows include System::Windows::Controls @@ -21,16 +22,26 @@ module Wpf end module ClassMethods + + # Load a XAML file on a class + # Load self.name if we weren't given a name option. If that doesn't exist, default to "app". + # Default to UserControl as the type option, unless def use_xaml(options = {}) - options = {:type => UserControl, :name => "app"}.merge(options) + if !options.has_key?(:name) || options[:name].nil? + name = Inflection.underscore(self.name) + options[:name] = XAP.get_file("#{name}.xaml") ? name : "app" + end + options[:type] = UserControl if !options.has_key?(:type) || options[:type].nil? + type = options[:type].new Application.load_component(type, Uri.new("#{options[:name]}.xaml", UriKind.Relative)) Application.current.root_visual = type end + end def root application.root_visual end -end \ No newline at end of file +end vendor/plugins/silverline/client/lib/helpers/wpf.rb @@ -1,3 +1,4 @@ + # Filling in the holes of IronRuby # Need attr* methods since in SL they throw a MethodAccessException @@ -34,4 +35,22 @@ class DateTime def to_s to_string end -end \ No newline at end of file +end + +module Inflection + def self.underscore(camel_cased_word) + camel_cased_word.to_s.gsub(/::/, '/'). + gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2'). + gsub(/([a-z\d])([A-Z])/,'\1_\2'). + tr("-", "_"). + downcase + end + + def self.constantize(camel_cased_word) + unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ camel_cased_word + raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!" + end + + Object.module_eval("::#{$1}", __FILE__, __LINE__) + end +end vendor/plugins/silverline/client/lib/patch.rb @@ -14,4 +14,90 @@ class Class end\n", __FILE__, __LINE__) end end -end \ No newline at end of file +end + + +# Hash#deep_merge +# From: http://pastie.textmate.org/pastes/30372, Elliott Hird +# Source: http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html +# This file contains extensions to Ruby and other useful snippits of code. +# Time to extend Hash with some recursive merging magic. + +class Hash + + # Merges self with another hash, recursively. + # + # This code was lovingly stolen from some random gem: + # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html + # + # Thanks to whoever made it. + + def deep_merge(hash) + target = dup + + hash.keys.each do |key| + if hash[key].is_a? Hash and self[key].is_a? Hash + target[key] = target[key].deep_merge(hash[key]) + next + end + + target[key] = hash[key] + end + + target + end + + + # From: http://www.gemtacular.com/gemdocs/cerberus-0.2.2/doc/classes/Hash.html + # File lib/cerberus/utils.rb, line 42 + + def deep_merge!(second) + second.each_pair do |k,v| + if self[k].is_a?(Hash) and second[k].is_a?(Hash) + self[k].deep_merge!(second[k]) + else + self[k] = second[k] + end + end + end + + +#----------------- + + # cf. http://subtech.g.hatena.ne.jp/cho45/20061122 + def deep_merge2(other) + deep_proc = Proc.new { |k, s, o| + if s.kind_of?(Hash) && o.kind_of?(Hash) + next s.merge(o, &deep_proc) + end + next o + } + merge(other, &deep_proc) + end + + + def deep_merge3(second) + + # From: http://www.ruby-forum.com/topic/142809 + # Author: Stefan Rusterholz + + merger = proc { |key,v1,v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 } + self.merge(second, &merger) + + end + + + def keep_merge(hash) + target = dup + hash.keys.each do |key| + if hash[key].is_a? Hash and self[key].is_a? Hash + target[key] = target[key].keep_merge(hash[key]) + next + end + #target[key] = hash[key] + target.update(hash) { |key, *values| values.flatten.uniq } + end + target + end + +end vendor/plugins/silverline/lib/patch/ruby.rb @@ -15,6 +15,8 @@ module Silverline::Essential::Generator watcher = FileSystemWatcher.new watcher.addDirectory CLIENT_ROOT watcher.addDirectory PLUGIN_CLIENT + watcher.addDirectory "#{PLUGIN_ROOT}/public" + watcher.addDirectory "#{RAILS_ROOT}/public/ironruby" # TODO: watch all client controllers, as well as all views watcher.addFile "#{RAILS_ROOT}/app/controllers/client_controller.rb" @@ -46,4 +48,4 @@ module Silverline::Essential::Generator FileUtils.rm_r TMP_CLIENT end -end \ No newline at end of file +end vendor/plugins/silverline/lib/silverline/essential/generator.rb @@ -8,7 +8,7 @@ module Silverline::Essential::Html require 'erb' defaults = { :start => "app", - :debug => true, + :debug => false, :reportErrors => "errorLocation", :properties => { :width => 1, @@ -17,7 +17,7 @@ module Silverline::Essential::Html :windowless => true } } - options = defaults.merge(options) + options = defaults.deep_merge(options) options[:start] << ".rb" retval = "" if options[:properties][:width].to_i < 2 || options[:properties][:height].to_i < 2 @@ -55,4 +55,4 @@ module Silverline::Essential::Html def templatify(path, b) ERB.new(File.open("#{Silverline::PLUGIN_ROOT}/templates/#{path}"){|f| f.read}).result(b) end -end \ No newline at end of file +end vendor/plugins/silverline/lib/silverline/essential/html.rb @@ -76,7 +76,7 @@ module Silverline::Essential class XAPChiron < XAP def generate - cmd = "public/ironruby/Chiron.exe /d:#{@directory} /z:#{@file}" + cmd = "public/ironruby/Chiron.exe /s /d:#{@directory} /z:#{@file}" # TODO: Should I do some platform detection rather than trial&error? system "#{cmd}" unless system "mono #{cmd}" end vendor/plugins/silverline/lib/silverline/essential/xap.rb @@ -3,14 +3,8 @@ module Silverline::Visualize::Helpers::Formats def ___ag_render_ruby_partial(filename, options) return silverlight_object options.merge({ - :start => "views/#{@__cpath}/#{filename}" - }) - end - - def ___ag_render_xaml_partial(filename, options) - return silverlight_object options.merge({ - :start => "app_render_xaml", - :xaml_to_render => "views/#{@__cpath}/#{filename}" + :start => "app_render_rb", + :rb_to_run => "views/#{@__cpath}/#{filename}" }) end @@ -18,8 +12,19 @@ module Silverline::Visualize::Helpers::Formats "#{config[:path]}#{config[:filename]}.#{config[:rb_ext]}" end + + def ___ag_render_xaml_partial(filename, options) + defaults = { + :start => "app_render_xaml", + :xaml_to_render => "views/#{@__cpath}/#{filename}", + } + xaml_type = options[:properties].delete(:type) + defaults[:xaml_type] = xaml_type unless xaml_type.nil? + return silverlight_object options.merge(defaults) + end + def ___ag_xaml_filename(config) "#{config[:path]}#{config[:filename]}.#{config[:xaml_ext]}" end -end \ No newline at end of file +end vendor/plugins/silverline/lib/silverline/visualize/helpers/formats.rb @@ -3,6 +3,9 @@ module Silverline::Visualize::Helpers::Templates include Configuration include Formats + # TODO: for now, actions bypass Silverlight altogether + # Should this be different? Like, should someone be able to + # render a Ruby/XAML file without a RHTML file first? def __ag_render_a_action(key, template, options, &block) _ag_render_without_silverlight(key, template, options, &block) end @@ -11,7 +14,7 @@ module Silverline::Visualize::Helpers::Templates config = ___ag_options_for_render("_#{template}") # Render first type found - # TODO: Make all this work if the full filename is supplied + # TODO: Make this work if the full filename is supplied [:ruby, :xaml].each do |type| if File.exists? send("___ag_#{type}_filename", config) return send("___ag_render_#{type}_partial", config[:filename], options) @@ -22,12 +25,15 @@ module Silverline::Visualize::Helpers::Templates _ag_render_without_silverlight(key, template, options, &block) end + # TODO: make inline Ruby/XAML work def __ag_render_a_inline(key, template, options, &block) _ag_render_without_silverlight(key, template, options, &block) end + # TODO: make general template rendering for ruby/xaml work. + # Not sure about actions (see above). def __ag_render_a_template(key, template, options, &block) _ag_render_without_silverlight(key, template, options, &block) end -end \ No newline at end of file +end vendor/plugins/silverline/lib/silverline/visualize/helpers/templates.rb vendor/plugins/silverline/public/ironruby/Chiron.exe @@ -20,7 +20,7 @@ -->  - <add key="localAssemblyPath" value="/ironruby" /> + <add key="localAssemblyPath" value="../../Libraries/Client" /> </appSettings>  <Languages> + <Language extensions="py" assemblies="IronPython.dll, IronPython.Modules.dll" /> <Language extensions="rb" assemblies="IronRuby.dll, IronRuby.Libraries.dll" /> + <Language extensions="js, jsx" assemblies="Microsoft.JScript.Runtime.dll, Microsoft.JScript.Compiler.dll" />  <div id="SilverlightControlHost" onload="self.focus()"> - <object data="data:application/x-silverlight," type="application/x-silverlight-2" width="<%= options[:properties][:width] %>" height="<%= options[:properties][:height] %>"> + <object data="data:application/x-silverlight," type="application/x-silverlight-2-b2" width="<%= options[:properties][:width] %>" height="<%= options[:properties][:height] %>"> <param name="source" value="<%= public_xap_file %>" /> <param name="onerror" value="onSilverlightError" /> <param name="background" value="<%= options[:properties][:background] %>" /> @@ -24,4 +24,5 @@ </a> </object> <iframe style='visibility:hidden;height:0;width:0;border:0px'></iframe> -</div> \ No newline at end of file +</div> + vendor/plugins/silverline/templates/body.html.erb @@ -12,4 +12,4 @@ errorDiv.innerHTML = args.errorType + "- " + args.errorMessage; } } -</script> \ No newline at end of file +</script> vendor/plugins/silverline/templates/head.html.erb vendor/plugins/silverline/client/lib/helpers/json_beta1.rb 4eaa9b0cd82e77c10356d69c8945a2fdb9108c4a Jimmy Schementi jschementi@gmail.com http://github.com/jschementi/silverline/commit/526a5bb06a08508aa6689253fe2b12800ab3e300 526a5bb06a08508aa6689253fe2b12800ab3e300

2008-05-22T00:49:20-07:00

Working on Silverlight 2 Beta2 - Hashes are having problems; though I can't seem to reproduce it in a vanilla RubySL app. - debug=false by default, for perf ... though it shouldn't affect perf - Updated public/ironruby with lastest build - Added /render_test/clock 15b00b2f1c45f32224fed02c4a5bcd473fa5304a Jimmy Schementi jschementi@gmail.com