ruby_mvc 0.0.1 → 0.0.2

data/ruby_mvc.gemspec

@@ -27,7 +27,7 @@ require 'rake'
 
 Gem::Specification.new do |s|
   s.name        = "ruby_mvc"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.summary     = "Ruby MVC"
   s.description = "A simple, cross-platform MVC framework for Ruby"
   s.authors     = [ "Andrew S. Townley" ]

data/sample/browser_view.rb

@@ -0,0 +1,57 @@
+#--
+######################################################################
+#
+# Copyright 2011-2012 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     browser_view.rb
+# Created:  Mon  2 Jan 2012 23:03:17 CET
+#
+######################################################################
+#++
+
+require 'mvc'
+include RubyMVC
+
+# NOTE: this is a simple, in-line test.  You wouldn't really
+# do it this way in a real application.
+
+RubyMVC.app :title => "BrowserView Sample", :width => 800, :height => 600 do
+  data = [
+    { :id => 1, :fname => "Bob", :lname => "Jones" },
+    { :id => 2, :fname => "Leslie", :lname => "Smith" },
+    { :id => 3, :fname => "Jake", :lname => "Bennigan" }
+  ]
+
+  model = Models::HashArrayTableModel.new(data)
+  template = Models::ViewModelTemplate.new do
+    property :id, :alias => "ID", :editable => false
+    property :fname, :alias => "First name"
+    property :lname, :alias => "Last name"
+  end
+  web_table = Views::WebContentTableView.new(template.apply(model))
+  
+  browser = Views::BrowserView.new
+  frame.add(browser)
+
+  browser.open "test.html"
+  browser.load_html("<h1>Hello</h1>", "internal:hello")
+  browser.load(web_table)
+  browser.signal_connect("navigation-requested") do |s, href, t|
+    puts "navigation requested: #{href}"
+    s.open href
+  end
+end

data/sample/form.rb

@@ -0,0 +1,59 @@
+#--
+######################################################################
+#
+# Copyright 2011 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     form.rb
+# Created:  Fri 30 Dec 2011 16:08:40 CET
+#
+######################################################################
+#++
+
+require 'mvc'
+include RubyMVC
+
+# NOTE: this is a simple, in-line test.  You wouldn't really
+# do it this way in a real application.
+
+RubyMVC.app :title => "Simple Form", :width => 800, :height => 600 do
+  model = Models::Model.new
+  model[:id] = 1
+  model[:fname] = "Jane"
+  model[:lname] = "Doe"
+  model[:description] = "Jane Doe is the hardest working individual I personally know.  She's amazing!"
+
+  # In this case, the FormView specifies the editors for the
+  # model properties, but the properties will always be
+  # displayed in the order in which they are defined in the
+  # model.  If more control is desired, then a
+  # ViewModelTemplate instance should be used to provide the
+  # desired ordering.
+
+  form = Views::FormView.new(model) do
+    disabled :id
+    editor :lname, :textfield
+    editor :fname, :textfield
+    editor :description, :textarea
+  end
+  form.signal_connect("form-submit") do |form, m|
+    puts "Model: #{m.inspect}"
+  end
+
+  dialog :title=> "Test Form" do |dlg|
+    dlg.add(form)
+  end
+end

data/sample/form2.rb

@@ -0,0 +1,63 @@
+#--
+######################################################################
+#
+# Copyright 2011 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     form2.rb
+# Created:  Sat 31 Dec 2011 13:30:53 CET
+#
+######################################################################
+#++
+
+require 'mvc'
+include RubyMVC
+
+# NOTE: this is a simple, in-line test.  You wouldn't really
+# do it this way in a real application.
+
+RubyMVC.app :title => "Simple Form", :width => 800, :height => 600 do
+  model = Models::Model.new
+  model[:id] = 1
+  model[:fname] = "Jane"
+  model[:lname] = "Doe"
+  model[:description] = "Jane Doe is the hardest working individual I personally know.  She's amazing!"
+
+  # The ViewModelTemplate specifies the order in which the
+  # properties will be displayed, in addition to allowing the
+  # definition of the property aliases and whether the
+  # properties should be editable or not.
+
+  template = Models::ViewModelTemplate.new do
+    property :id, :alias => "ID", :editable => false
+    property :fname, :alias => "First name"
+    property :lname, :alias => "Last name"
+  end
+  template.apply model
+
+  # When using the ViewModelTemplate, the FormView should be
+  # completely initialized with the defaults (assuming that
+  # the editors are supposed to be text fields.
+
+  form = Views::FormView.new(template)
+  form.signal_connect("form-submit") do |form, m|
+    puts "Model: #{m.inspect}"
+  end
+
+  dialog :title=> "Test Form" do |dlg|
+    dlg.add(form)
+  end
+end

data/sample/grid_table_view.rb

@@ -0,0 +1,68 @@
+#--
+######################################################################
+#
+# Copyright 2011-2012 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     grid_table_view.rb
+# Created:  Mon  2 Jan 2012 16:39:48 CET
+#
+######################################################################
+#++
+
+require 'mvc'
+include RubyMVC
+
+# NOTE: this is a simple, in-line test.  You wouldn't really
+# do it this way in a real application.
+
+RubyMVC.app :title => "GridTableView Sample", :width => 800, :height => 600 do
+  data = [
+    { :id => 1, :fname => "Bob", :lname => "Jones" },
+    { :id => 2, :fname => "Leslie", :lname => "Smith" },
+    { :id => 3, :fname => "Jake", :lname => "Bennigan" }
+  ]
+
+  model = Models::HashArrayTableModel.new(data, :row_template => {})
+#  model.signal_connect("rows-inserted") do |s, idx, rows|
+#    puts "insert #{rows.size} rows at #{idx}"
+#    puts "Model: #{model.inspect}"
+#  end
+#  model.signal_connect("rows-removed") do |s, idx, rows|
+#    puts "removed #{rows.size} rows"
+#    puts "Model: #{model.inspect}"
+#  end
+
+  template = Models::ViewModelTemplate.new do
+    property :id, :alias => "ID", :editable => false
+    property :fname, :alias => "First name"
+    property :lname, :alias => "Last name"
+  end
+  
+  grid = Views::GridTableView.new(template.apply(model), 
+                :show_row_labels => false, :editable => false)
+  grid.signal_connect("row-edit") do |s, m, i, r|
+    form = Views::FormView.new(template.apply(r))
+    form.signal_connect("form-submit") do |form, d|
+      m.update_row(i, r)
+    end
+    dialog :title => "Row Editor", :parent => frame do |dlg|
+      dlg.add(form)
+    end
+  end
+
+  frame.add(grid)
+end

data/sample/grid_view.rb

@@ -0,0 +1,44 @@
+#--
+######################################################################
+#
+# Copyright 2011 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     grid_view.rb
+# Created:  Sat 31 Dec 2011 19:04:31 CET
+#
+######################################################################
+#++
+
+require 'mvc'
+include RubyMVC
+
+# NOTE: this is a simple, in-line test.  You wouldn't really
+# do it this way in a real application.
+
+RubyMVC.app :title => "GridView", :width => 800, :height => 600 do
+  data = [
+    { :id => 1, :fname => "Bob", :lname => "Jones" },
+    { :id => 2, :fname => "Leslie", :lname => "Smith" },
+    { :id => 3, :fname => "Jake", :lname => "Bennigan" }
+  ]
+
+  model = Models::HashArrayTableModel.new(data)
+  grid = Toolkit::GridView.new(:show_row_labels => false)
+  grid.editable = false
+  grid.model = model
+  frame.add(grid)
+end

data/sample/grid_view2.rb

@@ -0,0 +1,57 @@
+#--
+######################################################################
+#
+# Copyright 2011 Andrew S. Townley
+#
+# Permission to use, copy, modify, and disribute this software for
+# any purpose with or without fee is hereby granted, provided that
+# the above copyright notices and this permission notice appear in
+# all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL THE
+# AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# File:     grid_view.rb
+# Created:  Sat 31 Dec 2011 19:04:31 CET
+#
+######################################################################
+#++
+
+require 'mvc'
+include RubyMVC
+
+# NOTE: this is a simple, in-line test.  You wouldn't really
+# do it this way in a real application.
+
+RubyMVC.app :title => "GridView with Model Template", :width => 800, :height => 600 do
+  data = [
+    { :id => 1, :fname => "Bob", :lname => "Jones" },
+    { :id => 2, :fname => "Leslie", :lname => "Smith" },
+    { :id => 3, :fname => "Jake", :lname => "Bennigan" }
+  ]
+
+  model = Models::HashArrayTableModel.new(data)
+  template = Models::ViewModelTemplate.new do
+    property :id, :alias => "ID", :editable => false
+    property :fname, :alias => "First name"
+    property :lname, :alias => "Last name"
+  end
+  template.apply model
+
+  grid = Toolkit::GridView.new(:show_row_labels => false)
+  grid.editable = false
+  grid.model = template
+  grid.signal_connect('row-activated') do |s, m, r, key|
+    puts "activated on row[#{r}] and property #{key}"
+  end
+  grid.signal_connect('row-selection-changed') do |s, m, rows|
+    puts "selection: #{rows.inspect}"
+  end
+  frame.add(grid)
+end

data/sample/test.html

@@ -4,6 +4,7 @@
   </head>
   <body>
     <h1>Hello WebView!</h1>
+    <p><a href="test2.html">Load another page</a></p>
 <p>
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris sit
 amet leo enim. Curabitur ultricies, dolor a fermentum molestie, ante

data/sample/test2.html

@@ -0,0 +1,33 @@
+<html>
+  <head>
+    <title>Test 2 HTML</title>
+  </head>
+  <body>
+    <h1>Another Page</h1>
+<p>
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris sit
+amet leo enim. Curabitur ultricies, dolor a fermentum molestie, ante
+dui imperdiet magna, sed tincidunt enim nisl sit amet quam. Ut
+adipiscing luctus adipiscing. Nullam elementum, arcu a molestie
+laoreet, lorem arcu pretium dolor, ut auctor nisi quam eget odio.
+Proin sagittis accumsan erat, a vestibulum diam pharetra ut. Nullam
+vitae leo tellus, id venenatis erat. Vivamus a nisi tellus, et
+volutpat augue. Nam ac massa nunc, eget consequat neque. Proin
+tincidunt, eros sed pretium gravida, ipsum lectus blandit ipsum, ut
+laoreet leo velit non risus. Nullam at dolor purus, vitae iaculis
+lorem.
+</p><p>
+Pellentesque habitant morbi tristique senectus et netus et malesuada
+fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci
+luctus et ultrices posuere cubilia Curae; Pellentesque eu enim odio.
+Sed rhoncus ornare magna, lacinia porttitor nunc tincidunt ut.
+Vestibulum sed placerat nunc. Nulla ut eros eget urna ornare volutpat.
+Suspendisse egestas lacus vitae velit congue ut tincidunt mauris
+faucibus. Donec non felis est, a fermentum quam. Morbi auctor justo
+non nibh rhoncus sed consequat nibh sollicitudin. Vivamus consectetur,
+eros eu lobortis dignissim, justo sapien mollis metus, ac vehicula
+velit leo in nisi. Suspendisse potenti. Suspendisse ut eleifend enim.
+Donec dignissim tincidunt purus vitae tempor.
+</p>
+  </body>
+</html>

data/sample/web_view.rb

@@ -31,4 +31,8 @@ RubyMVC.app :title => "WebView", :width => 800, :height => 600 do
   html = Toolkit::WebView.new
   frame.add(html)
   html.open "test.html"
+  html.signal_connect("navigation-requested") do |w, href, targ|
+    puts "navigation request: #{href}"
+    html.open href
+  end
 end

data/test/unit/models/test_array_table_model.rb

@@ -23,19 +23,21 @@
 ######################################################################
 #++
 
+$:.unshift File.join(File.dirname(__FILE__), "../../../lib")
+
 require 'testy'
-require 'ruby_mvc/models'
+require 'ruby_mvc'
 
 include RubyMVC::Models
 
-Testy.testing "Core ArrayTableModel tests" do
+Testy.testing "Core HashArrayTableModel tests" do
   test "Basic functionality" do |result|
     keys = [ :foo, :bar ]
     data = [
       { :foo => "Foo1", :bar => "Bar1" }, 
       { :foo => "Foo2", :bar => "Bar2" } ]
     
-    model = ArrayTableModel.new(data)
+    model = HashArrayTableModel.new(data)
     model.each_with_index do |row, i|
       keys.each do |key|
         result.check "row[#{i}][:#{key}] value is correct",
@@ -53,4 +55,18 @@ Testy.testing "Core ArrayTableModel tests" do
       end
     end
   end
+
+  test "Signal handling" do |result|
+    data = [
+      { :foo => "Foo1", :bar => "Bar1" }, 
+      { :foo => "Foo2", :bar => "Bar2" } ]
+
+    model = HashArrayTableModel.new([])
+    model.signal_connect("rows-inserted") do |s, i, r|
+      result.check "rows-inserted",
+          :expect => [ 0, true ],
+          :actual => [ i, r.size == 2 ]
+    end
+    model.insert_rows(0, data)
+  end
 end