Upgrade to SL2 Beta2

- Still has a bunch of problems (Hash, stack traces, File.open)

.eprj

@@ -4,14 +4,20 @@
     <dict>
         <key>fileTriggers</key>
         <dict>
+            <key>_posts.rb</key>
+            <string>app\views\posts\_posts.rb</string>
             <key>app.rb</key>
-            <string>C:\Users\jimmysch\Projects\vsl\Merlin\Users\jimmysch\dynamic_silverlight\photoviewer\ruby\app.rb</string>
+            <string>..\vsl\Merlin\Users\jimmysch\dynamic_silverlight\photoviewer\ruby\app.rb</string>
+            <key>generator.rb</key>
+            <string>vendor\plugins\silverline\lib\silverline\essential\generator.rb</string>
             <key>index.</key>
             <string>app\views\posts\index.html.erb</string>
             <key>index.h</key>
             <string>app\client\views\posts\index.erb.html</string>
             <key>silverli</key>
-            <string>C:\Users\jimmysch\Projects\vsl\Merlin\Users\jimmysch\dynamic_silverlight\photoviewer\ruby\silverlight.rb</string>
+            <string>..\vsl\Merlin\Users\jimmysch\dynamic_silverlight\photoviewer\ruby\silverlight.rb</string>
+            <key>xap.rb</key>
+            <string>vendor\plugins\silverline\lib\silverline\essential\xap.rb</string>
         </dict>
     </dict>
 </plist>

app/views/posts/_posts.html.erb

@@ -1,3 +1,6 @@
+<% if @posts.empty? %>
+  No posts, add one below!
+<% else %>
 <table>
     <tr>
     <% @posts.first.keys.each do |key| %>
@@ -7,8 +10,9 @@
     <% @posts.each do |post| %>
     <tr>
         <% post.keys.each do |key| %>
-        <td><%= post[key] %></td>"
+        <td><%= post[key] %></td>
         <% end %>
     </tr>
     <% end %>
-</table>
+</table>
+<% end %>

app/views/posts/_posts.rb

@@ -1,35 +1,10 @@
 require 'silverlight'
 
 class Posts < SilverlightApplication
-  def initialize
-    super
-    result = download "/posts.json"
-    @posts = result.empty? ? [] : JSON.new.parse(result)
-    render_posts :id => "posts"
-  end
-
-  def render_posts(options = {})
-    id, posts = options[:id], @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
+  def start
+    @posts = get "posts", :format => 'ruby'
+    render :partial => "posts/posts", :update => "posts"
   end
 end
 
-Posts.new
+Posts.new.start

public/clientaccesspolicy.xml

@@ -2,10 +2,10 @@
 <access-policy>
   <cross-domain-access>
     <policy>
-      <allow-from>      
+      <allow-from>
         <domain uri="*"/>
-      </allow-from>      
-      <grant-to>      
+      </allow-from>
+      <grant-to>
         <resource path="/" include-subpaths="true"/>
       </grant-to>      
     </policy>

public/ironruby/Chiron.exe.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <configSections>
     <section name="Languages" type="Chiron.LanguageSection, Chiron"/>
@@ -19,7 +19,7 @@
     <add key="urlPrefix" value="http://example.com/assemblies/" />
     -->
 
-	<add key="urlPrefix" value="http://localhost:3000/ironruby" />
+	<add key="urlPrefix" value="/ironruby" />
 
     <!-- the location of language assemblies on disk -->
     <add key="localAssemblyPath" value="." />
@@ -33,9 +33,7 @@
   -->
   <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" />
 
     <!--
     Example language entry. The languageContext attribute must point at the
@@ -60,7 +58,7 @@
   <AppManifest.xaml>
     <Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      RuntimeVersion="2.0.30226.00"
+      RuntimeVersion="2.0.30523.00"
       EntryPointAssembly="Microsoft.Scripting.Silverlight"
       EntryPointType="Microsoft.Scripting.Silverlight.DynamicApplication">
 

vendor/plugins/silverline/client/app_teleport.rb

@@ -21,15 +21,21 @@ def initialize
   private
 
     def find_client_links
-      titles = @client_links.collect { |l| l['title'] }
-      document.get_elements_by_tag_name("a").select { 
-        |a| titles.include?(a[:title]) && a[:rel] == "silverlight".to_clr_string
+      $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
+      document.get_elements_by_tag_name("a").select {
+        |a| titles.include?(a.title) && a.rel == "silverlight".to_clr_string
       }
     end
 
     def hook_client_link(a)
+      $app.puts "hooking stuff"
       link = @client_links.select{ |l| l['title'] == a[:title] }.first
+        $app.puts "hooking stuff"
       unless link.nil?
+        $app.puts "hooking stuff"
         a.onclick { |s, e| do_action(link['options']) }
         a.remove_attribute("title")
       end

vendor/plugins/silverline/client/lib/application.rb

@@ -1,45 +1,15 @@
 require 'lib/patch'
 require 'lib/helpers'
+require 'lib/rails'
 
 include System::Windows
 include System::Windows::Browser
 
 class SilverlightApplication
   include Downloader
-  #include Debug
-  # TODO: remove these methods when "extend" is implemented
-  def self.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 puts(msg)
-    self.class.puts(msg)
-  end
-  def self.debug_puts(msg)
-    puts(msg) if $DEBUG
-  end
-  def debug_puts(msg)
-    self.class.debug_puts(msg)
-  end
-
   include Html
-  # TODO: remove these method when "extend" is added
-  def self.document
-    HtmlPage.document
-  end
-
   include Wpf
-  # TODO: remove this method when "extend" is implemented
-  def self.use_xaml(options = {})
-    options = {:type => UserControl, :name => "app"}.merge(options)
-    type = options[:type].new
-    Application.load_component(type, Uri.new("#{options[:name]}.xaml", UriKind.Relative))
-    Application.current.root_visual = type
-  end
+  include Debug
 
   attr_reader :params
 
@@ -53,18 +23,28 @@ def application
   end
 
   def method_missing(m)
-    element = root.send(m)
-    element = document.send(m) if element.nil?
-    return element
+    super
+  rescue => e
+    begin
+      return element = root.send(m)
+    rescue 
+      begin
+        return element = document.send(m)
+      rescue
+        raise e
+      end
+    end
   end
 
   def dejsonify(o)
     JSON.new.parse(o.replace("==>", ",").replace("'", "\""))
   end
 
-  #def render(options = {})
-  #  file = File.open("views/#{options[:view]}.erb.html", 'r')
-  #  rhtml = ERB.new file.read
-  #  document.send(options[:id])[:innerHTML] = rhtml.run(binding)
-  #end
+  def render(options = {})
+    split_url = options[:partial].split "/"
+    split_url[-1] = "_#{split_url[-1]}"
+    partial = split_url.join "/"
+    rhtml = ERB.new XAP.get_file_contents("views/#{partial}.html.erb")
+    document.send(options[:update])[:innerHTML] = rhtml.result(binding)
+  end
 end

vendor/plugins/silverline/client/lib/helpers.rb

@@ -2,4 +2,5 @@
 require 'lib/helpers/downloader'
 require 'lib/helpers/html'
 require 'lib/helpers/wpf'
-require 'lib/helpers/json'
+require 'lib/helpers/json_beta1'
+require 'lib/helpers/xap'

vendor/plugins/silverline/client/lib/helpers/debug.rb

@@ -1,20 +1,31 @@
 module Debug
-  def self.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}"
+  def self.included(base)
+    base.extend(ClassMethods)
+    base.include(InstanceMethods)	
   end
-  def puts(msg)
-    self.class.puts(msg)
+
+  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
   end
-
-  def self.debug_puts(msg)
-    puts(msg) if $DEBUG
-  end
-  def debug_puts(msg)
-    self.class.debug_puts(msg)
+
+  module InstanceMethods
+	  def puts(msg)
+	    self.class.puts(msg)
+	  end
+
+	  def debug_puts(msg)
+	    self.class.debug_puts(msg)
+	  end
   end
 end

vendor/plugins/silverline/client/lib/helpers/downloader.rb

@@ -15,4 +15,10 @@ def download(url, &block)
     end
   end
 
+  def get(url, options, &block)
+    json = download "/#{url}.json"
+    return JSON.new.parse(json) if options[:format] == 'ruby'
+    return json
+  end
+
 end

vendor/plugins/silverline/client/lib/helpers/html.rb

@@ -2,7 +2,6 @@
 include System::Windows::Browser
 
 module Html
-=begin
   def self.included(base)
     base.extend(ClassMethods)
   end
@@ -12,7 +11,7 @@ def document
       HtmlPage.document
     end
   end
-=end  
+
   def document
     self.class.document
   end