ruby_mvc 0.0.3 → 0.0.4

data/lib/ruby_mvc/ar_support.rb

@@ -0,0 +1,84 @@
+#--
+######################################################################
+#
+# 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:     ar_support.rb
+# Created:  Mon 12 Dec 2011 06:49:00 CST
+#
+#####################################################################
+#++ 
+
+require 'active_record'
+
+require 'ruby_mvc/models/ar_row_model'
+require 'ruby_mvc/models/ar_table_model'
+require 'ruby_mvc/views/ar_form_view'
+require 'ruby_mvc/views/ar_type_editor'
+require 'ruby_mvc/views/ar_web_type_list'
+require 'ruby_mvc/views/ar_web_model_view'
+
+module RubyMVC
+
+  class ActiveRecordModelRegistry < Hash
+    def model(etk, options = {})
+      key = etk
+      key = etk.to_s.to_sym if !etk.is_a? Symbol
+      if has_key? key
+        self[key]
+      else
+        self[key] = Models::ActiveRecordTableModel.new(etk, options)
+      end
+    end
+  end
+
+  def self.model(*args, &block)
+    @ar_models ||= ActiveRecordModelRegistry.new
+    @ar_models.model(etk, options)
+  end
+
+  class ActiveRecordTemplateRegistry < Hash
+    def template(etk, title = nil, options = {}, &block)
+      if title.is_a? Hash
+        options = title
+        title = options[:title]
+      end
+      key = etk
+      key = etk.to_s.to_sym if !etk.is_a? Symbol
+      if block
+        obj = Models::ViewModelTemplate.new(options, &block)
+        obj.title = title || etk.to_s
+        self[key] = obj
+      else
+        self[key]
+      end
+    end
+  end
+
+  def self.template(*args, &block)
+    @ar_templates ||= ActiveRecordTemplateRegistry.new
+    @ar_templates.template(*args, &block)
+  end
+
+  def template(*args, &block)
+    RubyMVC.template(*args, &block)
+  end
+
+  def model(*args, &block)
+    RubyMVC.model(*args, &block)
+  end
+end

data/lib/ruby_mvc/controllers.rb

@@ -25,4 +25,5 @@
 
 require 'ruby_mvc/controllers/action'
 require 'ruby_mvc/controllers/action_group'
+require 'ruby_mvc/controllers/action_provider'
 require 'ruby_mvc/controllers/app_controller'

data/lib/ruby_mvc/{views/ar_support.rb → controllers/action_provider.rb}

@@ -1,7 +1,7 @@
 #--
 ######################################################################
 #
-# Copyright 2011 Andrew S. Townley
+# 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
@@ -17,13 +17,27 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# File:     ar_support.rb
-# Created:  Mon 12 Dec 2011 06:49:00 CST
+# File:     action_provider.rb
+# Created:  Sat 14 Jan 2012 13:16:53 GMT
 #
 #####################################################################
 #++ 
 
-require 'ruby_mvc/views/ar_form_view'
-require 'ruby_mvc/views/ar_type_editor'
-require 'ruby_mvc/views/ar_web_type_list'
-require 'ruby_mvc/views/ar_web_model_view'
+module RubyMVC
+
+  # This module is used to provide actions to toolkit widget
+  # implementations for appropriate rendering based on the
+  # widget type.
+
+  module ActionProvider
+    attr_reader :actions
+
+    def action(key, options = {}, &block)
+      @actions ||= ActionGroup.new
+      a = Action.new(key, options, &block)
+      @actions << a
+      a
+    end
+  end
+
+end

data/lib/ruby_mvc/controllers/app_controller.rb

@@ -42,7 +42,16 @@ module RubyMVC
     def link_activated(sender, link)
       puts "#link_activated(#{sender}, #{link})"
       uri = URI.parse(link)
-      params = CGI.parse(uri.query) if uri.query
+      
+      if uri.query
+        params = CGI.parse(uri.query)
+        params.each do |k, v|
+          if v && v.size == 1
+            params[k] = v.first
+          end
+        end
+      end
+
       m = RubyMVC.method_name(uri.path).to_sym
       if self.respond_to? m
         self.send(m, sender, link, params)

data/lib/ruby_mvc/controllers/rails_controller.rb

@@ -23,9 +23,7 @@
 #####################################################################
 #++ 
 
-require 'active_record'
-require 'ruby_mvc/models/ar_table_model'
-require 'ruby_mvc/views/ar_support'
+require 'ruby_mvc/ar_support'
 
 module RubyMVC
 

data/lib/ruby_mvc/models/ar_row_model.rb

@@ -0,0 +1,62 @@
+#--
+######################################################################
+#
+# 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:     ar_row_model.rb
+# Created:  Thu 12 Jan 2012 16:47:20 GMT
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+module Models
+
+  # This class provides a Model adapter implementation for
+  # ActiveRecordBase class instances.
+
+  class ActiveRecordRowModel < Model
+    def initialize(row, options = {})
+      options[:data] = row
+      super(options)
+    end
+
+    def entity_type
+      @data.class
+    end
+
+    def keys
+      @data.attributes.keys.collect { |k| k.to_sym }
+    end
+
+    # This method provides information about inter-model links
+    # to provide built-in support for master-detail types of
+    # relationships between models.
+
+    def link_labels
+      # FIXME: should probably implement this intelligently to
+      # do some introspection magic
+      {}
+    end
+
+    def size
+      @data.attributes.keys.size
+    end
+  end
+
+end
+end

data/lib/ruby_mvc/models/ar_table_model.rb

@@ -33,7 +33,7 @@ module Models
   # the rows matching a particular query.
 
   class ActiveRecordTableModel < TableModel
-    attr_reader :keys
+    attr_reader :keys, :entity_type
 
     def initialize(entity_type, options = {})
       super()
@@ -118,18 +118,18 @@ module Models
     end
 
     def size
-      puts "idx.size: #{@row_idx.size}"
+#      puts "idx.size: #{@row_idx.size}"
       [_rows.count, @row_idx.size].max
     end
 
   protected
     def _rows
-      if @filter
+      if @filter && !@rows
         x = @entity_type.where(@filter)
       else
         x = @rows || @entity_type.find(:all)
       end
-      puts "working with #{x.count} rows"
+#      puts "working with #{x.count} rows"
       x
     end
   end

data/lib/ruby_mvc/models/model.rb

@@ -79,6 +79,14 @@ module Models
       end
     end
 
+    # This method provides information about inter-model links
+    # to provide built-in support for master-detail types of
+    # relationships between models.
+
+    def link_labels
+      {}
+    end
+
     # This method is used to check whether a property key is
     # editable or not
 

data/lib/ruby_mvc/models/view_model_template.rb

@@ -43,6 +43,8 @@ module Models
   # may be accessed.
   
   class ViewModelTemplate
+    include ActionProvider
+
     attr_accessor :title
 
     # When the ViewModelTemplate is initialized, it requires a set
@@ -52,8 +54,10 @@ module Models
     def initialize(options = {}, &block)
       @options = options
       @labels = []
+      @link_labels = []
       @options[:editable] ||= {}
       @options[:properties] ||= []
+      @options[:links] ||= []
       self.instance_eval(&block) if block
     end
 
@@ -68,6 +72,10 @@ module Models
       @labels
     end
 
+    def link_labels
+      @link_labels
+    end
+
     # Implement the Model#is_editable? method in terms of the
     # template definition.  If the template doesn't further
     # restrict the behavior, the model's definition is used
@@ -94,7 +102,7 @@ module Models
     # through the view.
 
     def property(key, options = {})
-      puts "options: #{options.inspect}"
+#      puts "options: #{options.inspect}"
       key = key.to_sym
       
       if false == options[:show]
@@ -117,6 +125,32 @@ module Models
       end
     end
 
+    # This method is used to declare a linked property for the
+    # model and make it available to the view
+
+    def link(key, options = {})
+      key = key.to_sym
+      
+      if false == options[:show]
+        show = false
+      else
+        show = true
+      end
+
+      editable(key, false) if false == options[:editable]
+      
+      if show && !@options[:links].include?(key)
+        @options[:links] << key
+        l = options[:alias] || key.to_s.capitalize
+        @link_labels << options.merge({ :key => key, :label => l })
+      elsif !show
+        @options[:links].delete(key)
+        @link_labels.delete_if do |k|
+          k[:key] == key
+        end
+      end
+    end
+    
     # This method is used to apply the template to a specific,
     # concrete model instance, creating a clone of the
     # template in the process so that multiple different

data/lib/ruby_mvc/renderers/hyperlink_cell_renderer.rb

@@ -33,11 +33,13 @@ module RubyMVC
 
       def render(widget, row, col)
         lk = col[:hl_label_key] || col[:key]
+#        puts "LK: #{lk.inspect}; row: #{row.inspect}"
         text = row[lk]
-        val = row[col[:key]]
+        href = col[:href]
+        val = row[col[:href_key] || col[:key]]
         tagz {
-          td_ {
-            a_ text, :href => "#{col[:href]}#{val}"
+          td_(:valign => "top") {
+            a_ text, :href => "#{href}#{val}"
           }
         }
       end

data/lib/ruby_mvc/toolkit/dialog.rb

@@ -27,6 +27,14 @@ module RubyMVC
   module Toolkit
   
     class Dialog < Widget
+      # this signal is triggered after the dialog has been
+      # processed modally and will return one of a range of
+      # response codes, depending on the type of the dialog.
+      #
+      # The standard response codes are :accept or :cancel
+
+      signal "response"
+
       def add(w)
         # FIXME: this is a cheezy way to do this...
         if w.is_a? RubyMVC::Views::FormView

data/lib/ruby_mvc/toolkit/peers/wxruby/dialog.rb

@@ -27,6 +27,7 @@ module RubyMVC
   module Toolkit
     module WxRuby
       class Dialog < Wx::Dialog
+        include SignalHandler
         include Common
         Toolkit::Dialog.peer_class = self
 
@@ -64,12 +65,26 @@ module RubyMVC
           self.sizer.fit(self)
         end
 
+        def add_view(view)
+          sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+          view.peer.reparent(self)
+          sizer.add(view.peer, 1, Wx::EXPAND|Wx::ALL, 5)
+          sizer.add(@buttons, 0, Wx::ALIGN_RIGHT|Wx::ALL, 5)
+          self.sizer = sizer
+          layout
+        end
+
         def show
           self.centre
           if @modal
-            if Wx::ID_OK == self.show_modal()
+            case self.show_modal()
+            when Wx::ID_OK, Wx::ID_YES
               @wxform.submit if @wxform
+              resp = :accept
+            else
+              resp = :cancel
             end
+            signal_emit("response", self, resp)
           else
             sel.show()
           end

data/lib/ruby_mvc/toolkit/peers/wxruby/form_builder.rb

@@ -51,7 +51,7 @@ module RubyMVC
         def build(parent, form)
           @form = form
           form.layout do |key, label, val, editor, disabled|
-          puts "key: #{key}; disabled: #{disabled}"
+#          puts "key: #{key}; disabled: #{disabled}"
             case(editor)
             when :textarea
               w = build_textfield(parent, label, val, true)

data/lib/ruby_mvc/toolkit/peers/wxruby/grid_view.rb

@@ -32,7 +32,7 @@ module RubyMVC
         Toolkit::GridView.peer_class = self
 
         def initialize(options = {})
-          puts "options: #{options.inspect}"
+#          puts "options: #{options.inspect}"
           super(WxRuby.parent(options), options[:id] || -1)
           if false == options[:show_row_labels]
             set_row_label_size(0)
@@ -58,7 +58,13 @@ module RubyMVC
 #            puts "Event alt: #{e.alt_down}; ctrl: #{e.control_down}; brc: #{e.get_bottom_right_coords}; bottom: #{e.get_bottom_row}; left: #{e.get_left_col}; right: #{e.get_right_col}; tlc: #{e.get_top_left_coords}; top: #{e.get_top_row}; meta: #{e.meta_down}; selecting: #{e.selecting}; shift: #{e.shift_down}"
             top = e.get_top_row
             bottom = e.get_bottom_row
-            sel = []
+            if e.meta_down || e.shift_down
+              # extending the selection
+              sel = @selected_rows.clone
+            else
+              # reset the selection
+              sel = []
+            end
             top.upto(bottom) do |i|
               sel << i
             end
@@ -80,18 +86,18 @@ module RubyMVC
           # Grid displaying it.  Kinda defeats the point...
 
           @model.signal_connect("rows-inserted") do |s, i, r|
-            puts "refresh rows-inserted"
+#            puts "refresh rows-inserted"
             @gm = GridModel.new(model)
             set_table(@gm, Wx::Grid::GridSelectRows, false)
           end
           @model.signal_connect("rows-removed") do |s, i, r|
-            puts "refresh rows-removed"
+#            puts "refresh rows-removed"
             @gm = GridModel.new(model)
             selected_rows.delete(i)
             set_table(@gm, Wx::Grid::GridSelectRows, false)
           end
           @model.signal_connect("row-changed") do |s, i, r|
-            puts "refresh row-changed"
+#            puts "refresh row-changed"
             @gm = GridModel.new(model)
             set_table(@gm, Wx::Grid::GridSelectRows, false)
           end

data/lib/ruby_mvc/toolkit/peers/wxruby/web_view.rb

@@ -111,6 +111,7 @@ module RubyMVC
 
       protected
         def load_entry(entry)
+#          puts "ENTRY: #{entry.inspect}"
           if html = entry[:content]
             set_page(html)
           else

data/lib/ruby_mvc/toolkit/signal_handler.rb

@@ -137,11 +137,21 @@ module Toolkit
     end
 
     def signal_emit(signal, *args)
+      # FIXME: there's a few things wrong with this now that
+      # we've changed to support multiple signal handlers.
+      # Registration/deregistration should be cleaner, but
+      # then we'd be using an observer pattern vs the signal
+      # handler.  Anyway, with multiple registered handlers,
+      # if the signal is vetoable, then it should throw a veto
+      # exception or something.
+
       self.class.valid_signal! signal if self.class.respond_to? :signals
       signals = (@signals ||= {})
+      rval = nil
       (signals[signal] ||= []).each do |proc|
-        proc.call(*args) if !proc.nil?
+        (rval = proc.call(*args)) if !proc.nil?
       end
+      rval
     end
   end
 

data/lib/ruby_mvc/toolkit/widget.rb

@@ -103,7 +103,7 @@ module RubyMVC
 
       def connect_peer_signals
         self.class.signals.each do |s, opts|
-          puts "connecting signal '#{peer}##{s}' to #{self}"
+#          puts "connecting signal '#{peer}##{s}' to #{self}"
           peer.signal_connect(s) do |*args|
             args[0] = self
             signal_emit(s, *args)

data/lib/ruby_mvc/views/ar_type_editor.rb

@@ -35,7 +35,8 @@ module Views
       super((@template ? @template.apply(@model) : @model), options)
       signal_connect("row-edit") do |s, m, i, r|
         app.dialog(:title => options[:editor_title], :parent => parent) do |dlg|
-          form = FormView.new((@template ?  @template.apply(r) : r), &block)
+          fm = (@template ?  @template.apply(r) : Models::ActiveRecordRowModel.new(r))
+          form = FormView.new(fm, &block)
           form.signal_connect("form-submit") do |form, d|
             begin
               r.save!

data/lib/ruby_mvc/views/ar_web_model_view.rb

@@ -27,9 +27,24 @@ module RubyMVC
 module Views
 
   class ActiveRecordWebModelView < WebModelView
+    signal "add-child"
+    signal "add-child-link"
     signal "row-edit"
     signal "row-delete", :vetoable => true
 
+    # This signal is triggered when the view needs to render
+    # an action link for one of the linked models.  Currently
+    # supported command keys are:
+    #
+    # - :link_edit - return a hash with the href to edit the
+    #               link entries
+    #
+    # In each case, the arguments sent are the view, the
+    # command key, the model and the label entry being
+    # rendered.
+
+    signal "action-link"
+
     def initialize(row, options = {})
       super
 
@@ -40,18 +55,137 @@ module Views
 #      action(:delete, :label => "Delete", :icon => :stock_delete) do
 #        signal_emit("row-delete", self, row)
 #      end
+
+      begin
+        if @model.children
+          action(:add_child, :label => "Add Child", :icon => :stock_new) do
+            signal_emit("add-child", self, row)
+          end
+
+          action(:add_child_link, :label => "Add Child Link", :icon => :stock_new) do
+            signal_emit("add-child-link", self, row)
+          end
+        end
+      rescue NoMethodError
+        # we ignore this on purpose
+      end
     end
 
     def render
-      html = super
+      # FIXME: this isn't the way to properly test for
+      # ancestry, but we need it right now.  Needs to have a
+      # review/revisit of the way things are nested.  It's
+      # evolving a little organically at the moment
+      # (2012-01-12: ast)
+
       tagz {
-        tagz.concat html
-        tagz.concat render_links
+        render_parent
+        super
+        render_links
       }
     end
 
   protected
+    def render_parent
+      # FIXME: this is really screwed up and shouldn't really
+      # work this way
+#      puts "#render_ancestry"
+      begin
+        @model.reload
+        kidz = @model.subtree[1..-1]
+#        puts "Ancestors: " <<  kidz.inspect
+        tagz {
+          if cmd = signal_emit("action-link", self, :parent_edit, @model, {})
+            cmd2 = signal_emit("action-link", self, :unparent, @model, {})
+            h3_("Parent ") {
+              font_(:size => "2") {
+                a_ cmd.delete(:text), cmd
+                tagz.push " "
+                a_ cmd2.delete(:text), cmd2 if cmd2
+              }
+            }
+          end
+          if parent = @model.parent
+#            puts "parent: #{parent.inspect}"
+            et = parent.class
+            pm = Models::ActiveRecordTableModel.new(et, :rows => [ parent ])
+            if tmpl = RubyMVC.template(et)
+              pm = tmpl.apply(pm)
+            end
+            tagz.push WebContentTableView.new(pm).render
+          end
+        }
+      rescue NoMethodError => e 
+        puts "warning: #{e}"
+#        puts e.backtrace
+      end
+    end
+
     def render_links
+#      puts "#render_links"
+
+      tagz {
+        # render children first
+        render_children
+
+        return if @model.link_labels.size == 0
+
+        # render other links
+        @model.link_labels.each do |l|
+          links = @model.send(l[:key], true)
+          edits = []
+          cmds = [ :linked_edit ]
+          if l.has_key? :link_entity
+            cmds.insert(0, :add_link)
+            cmds.insert(0, :add_linked)
+            cmds << :link_edit
+          end
+
+          cmds.each do |cmd|
+            edits << signal_emit("action-link", self, cmd, @model, l)
+          end
+          let = l[:entity_type]
+          h3_("#{let} links (#{links.size})") {
+            if edits.size > 0
+              font_(:size => "2") {
+                edits.each do |cmd|
+                  tagz.push " "
+                  a_ cmd.delete(:text), cmd
+                end
+              }
+            end
+          }
+          if links.size > 0
+            lm = Models::ActiveRecordTableModel.new(let, :rows => links)
+            if tmpl = RubyMVC.template(let)
+              lm = tmpl.apply(lm)
+            end
+            tagz.push WebContentTableView.new(lm).render
+          end
+        end
+      }
+    end
+
+    def render_children
+      begin
+#        puts "MODEL HAS CHILDREN? #{@model.has_children?}: #{@model.inspect}"
+        if @model.has_children?
+          kidz = @model.children
+#          puts "Children: " << kidz.inspect
+          et = kidz.first.class
+          km = Models::ActiveRecordTableModel.new(et, :rows => kidz)
+          if tmpl = RubyMVC.template(et)
+            km = tmpl.apply(km)
+          end
+          tagz {
+            h3_("Child #{et.to_s.pluralize}")
+            tagz.push WebContentTableView.new(km).render
+          }
+        end
+      rescue NoMethodError => e 
+        puts "warning: #{e}"
+#        puts e.backtrace
+      end
     end
   end
 

data/lib/ruby_mvc/views/ar_web_type_list.rb

@@ -27,6 +27,8 @@ module RubyMVC
 module Views
 
   class ActiveRecordWebTypeList < WebContentTableView
+    signal "add-row"
+
     def initialize(entity_type, options = {}, &block)
       @model = Models::ActiveRecordTableModel.new(entity_type, options)
       if options.is_a? Hash
@@ -36,7 +38,12 @@ module Views
         options = {}
       end
       super((@template ? @template.apply(@model) : @model), options)
-      action(:edit, :label => "Edit", :icon => :stock_edit, &block)
+      
+      action(:add, :label => "Add #{entity_type}", :icon => :stock_new) do
+        signal_emit("add-row", self, entity_type)
+      end
+     
+     action(:edit, :label => "Edit", :icon => :stock_edit, &block)
     end
   end
 

data/lib/ruby_mvc/views/browser_view.rb

@@ -85,7 +85,7 @@ module Views
       widget.signal_connect("navigation-requested") do |s, h, t|
         puts "BrowserView#navigation-requested: #{h}"
         if (c = self.controller)
-          puts "forwarding to controller: #{c}"
+#          puts "forwarding to controller: #{c}"
           c.link_activated(s, h)
         end
       end
@@ -115,7 +115,7 @@ module Views
     end
 
     def reload
-      if location && v = location[:view]
+      if location && (v = location[:view])
         load(v, location[:uri])
       else
         super
@@ -144,10 +144,10 @@ module Views
       # place)
 
       if (vc = view.controller) && vc != self.controller
-        puts "assigned new controller from WebContentView: #{vc}"
+#        puts "assigned new controller from WebContentView: #{vc}"
         self.controller = vc
       else
-        puts "no controller defined for #{view}"
+#        puts "no controller defined for #{view}"
       end
 
       # add any content actions

data/lib/ruby_mvc/views/grid_table_view.rb

@@ -59,7 +59,7 @@ module Views
               :enable => :select_multi,
               :icon => :stock_delete
               ) do
-        puts "rows: #{widget.selected_rows.inspect}"
+#        puts "rows: #{widget.selected_rows.inspect}"
         widget.selected_rows.reverse_each do |i|
           model.remove_row(i)
         end
@@ -76,7 +76,7 @@ module Views
       end
 
       widget.signal_connect("row-selection-changed") do |s, m, rows|
-        puts "selection changed: #{rows.inspect}"
+#        puts "selection changed: #{rows.inspect}"
         @actions.each do |a|
           a.selection(s, m, rows)
         end
@@ -87,8 +87,8 @@ module Views
         signal_emit("row-edit", self, model, r, row)
       end
 
-      puts "self.class.signals: #{self.class.signals.keys.inspect}"
-      puts "widget.class.signals: #{widget.class.signals.keys.inspect}"
+#      puts "self.class.signals: #{self.class.signals.keys.inspect}"
+#      puts "widget.class.signals: #{widget.class.signals.keys.inspect}"
     end
   end
 

data/lib/ruby_mvc/views/view.rb

@@ -25,23 +25,20 @@
 
 module RubyMVC
   module Views
-   
+
     class View < RubyMVC::Toolkit::AbstractWidget
-      attr_reader :actions
+      include ActionProvider
       attr_accessor :controller
 
       def initialize(options = {})
-        @actions = ActionGroup.new
         @options = options
         self.controller = options[:controller]
         (options[:actions] || []).each { |a| @actions << a }
       end
 
     protected
-      def action(key, options = {}, &block)
-        a = Action.new(key, options, &block)
-        @actions << a
-        a
+      def options
+        @options
       end
     end
 
@@ -73,7 +70,7 @@ module RubyMVC
         # widgets.
 
         def widget(*args, &block)
-          puts "Set widget for #{self}: #{args.inspect}"
+#          puts "Set widget for #{self}: #{args.inspect}"
           @widget_def = { :args => args, :block => block }
         end
       end
@@ -96,11 +93,11 @@ module RubyMVC
       # appropriately manage signal registration
 
       def signal_connect(signal, &b)
-        puts "Widget class: #{@widget.class}"
+#        puts "Widget class: #{@widget.class}"
         if @widget.class.valid_signal? signal
           @widget.signal_connect(signal, &b)
         else
-         puts "super"
+#         puts "super"
           super
         end
       end

data/lib/ruby_mvc/views/web_content_table_view.rb

@@ -31,8 +31,13 @@ module Views
 
   class WebContentTableView < WebContentView
     def render
+      html = ""
+      if t = @options[:title]
+        html << "<h2>" << t << "</h2>"
+      end
+
       r = @options[:renderer] || Renderers::Html4TableModelRenderer
-      r.render(@model, @options)
+      html << r.render(@model, @options)
     end
   end
 

data/lib/ruby_mvc/views/web_model_view.rb

@@ -30,6 +30,7 @@ module Views
     include Tagz
 
     def initialize(row, options = {})
+      @model_type = row.class
       if options.is_a? Hash
         @template = options[:template]
       else
@@ -46,7 +47,8 @@ module Views
   protected
     def render_properties
       tagz {
-        table_(:border => 0, :cellspacing => 3) {
+        h2_(@model_type)
+        table_(:border => 1, :cellspacing => 0) {
           @model.labels.each do |l|
             k = l[:key]
             tr_ {

data/ruby_mvc.gemspec

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

metadata

@@ -2,7 +2,7 @@
 name: ruby_mvc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Andrew S. Townley
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-10 00:00:00 Z
+date: 2012-01-14 00:00:00 Z
 dependencies: []
 
 description: A simple, cross-platform MVC framework for Ruby
@@ -22,75 +22,77 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/ruby_mvc/application.rb
-- lib/ruby_mvc/controllers/action.rb
-- lib/ruby_mvc/controllers/action_group.rb
-- lib/ruby_mvc/controllers/app_controller.rb
-- lib/ruby_mvc/controllers/rails_controller.rb
-- lib/ruby_mvc/controllers.rb
-- lib/ruby_mvc/models/ar_table_model.rb
-- lib/ruby_mvc/models/array_table_model.rb
-- lib/ruby_mvc/models/keyed_array_table_model.rb
-- lib/ruby_mvc/models/model.rb
-- lib/ruby_mvc/models/table_model.rb
-- lib/ruby_mvc/models/view_model_template.rb
+- lib/ruby_mvc/views/ar_type_editor.rb
+- lib/ruby_mvc/views/ar_web_type_list.rb
+- lib/ruby_mvc/views/web_content_table_view.rb
+- lib/ruby_mvc/views/ar_web_model_view.rb
+- lib/ruby_mvc/views/web_content_view.rb
+- lib/ruby_mvc/views/table_view.rb
+- lib/ruby_mvc/views/form_view.rb
+- lib/ruby_mvc/views/view.rb
+- lib/ruby_mvc/views/browser_view.rb
+- lib/ruby_mvc/views/web_model_view.rb
+- lib/ruby_mvc/views/grid_table_view.rb
+- lib/ruby_mvc/views/ar_form_view.rb
+- lib/ruby_mvc/wx.rb
+- lib/ruby_mvc/toolkit.rb
 - lib/ruby_mvc/models.rb
-- lib/ruby_mvc/module.rb
-- lib/ruby_mvc/renderers/html4_table_model_renderer.rb
-- lib/ruby_mvc/renderers/hyperlink_cell_renderer.rb
-- lib/ruby_mvc/renderers.rb
-- lib/ruby_mvc/toolkit/app.rb
-- lib/ruby_mvc/toolkit/browser_history.rb
-- lib/ruby_mvc/toolkit/dialog.rb
-- lib/ruby_mvc/toolkit/frame.rb
-- lib/ruby_mvc/toolkit/grid_view.rb
-- lib/ruby_mvc/toolkit/messagebox.rb
-- lib/ruby_mvc/toolkit/peers/wxruby/app.rb
-- lib/ruby_mvc/toolkit/peers/wxruby/box_layout.rb
 - lib/ruby_mvc/toolkit/peers/wxruby/common.rb
+- lib/ruby_mvc/toolkit/peers/wxruby/box_layout.rb
+- lib/ruby_mvc/toolkit/peers/wxruby/grid_view.rb
 - lib/ruby_mvc/toolkit/peers/wxruby/dialog.rb
+- lib/ruby_mvc/toolkit/peers/wxruby/app.rb
 - lib/ruby_mvc/toolkit/peers/wxruby/form_builder.rb
 - lib/ruby_mvc/toolkit/peers/wxruby/frame.rb
-- lib/ruby_mvc/toolkit/peers/wxruby/grid_model.rb
-- lib/ruby_mvc/toolkit/peers/wxruby/grid_view.rb
-- lib/ruby_mvc/toolkit/peers/wxruby/messagebox.rb
 - lib/ruby_mvc/toolkit/peers/wxruby/web_view.rb
+- lib/ruby_mvc/toolkit/peers/wxruby/messagebox.rb
+- lib/ruby_mvc/toolkit/peers/wxruby/grid_model.rb
 - lib/ruby_mvc/toolkit/peers/wxruby.rb
-- lib/ruby_mvc/toolkit/property_change_notifier.rb
+- lib/ruby_mvc/toolkit/grid_view.rb
+- lib/ruby_mvc/toolkit/dialog.rb
+- lib/ruby_mvc/toolkit/app.rb
 - lib/ruby_mvc/toolkit/signal_handler.rb
+- lib/ruby_mvc/toolkit/frame.rb
+- lib/ruby_mvc/toolkit/browser_history.rb
 - lib/ruby_mvc/toolkit/web_view.rb
+- lib/ruby_mvc/toolkit/messagebox.rb
 - lib/ruby_mvc/toolkit/widget.rb
-- lib/ruby_mvc/toolkit.rb
-- lib/ruby_mvc/views/ar_form_view.rb
-- lib/ruby_mvc/views/ar_support.rb
-- lib/ruby_mvc/views/ar_type_editor.rb
-- lib/ruby_mvc/views/ar_web_model_view.rb
-- lib/ruby_mvc/views/ar_web_type_list.rb
-- lib/ruby_mvc/views/browser_view.rb
-- lib/ruby_mvc/views/form_view.rb
-- lib/ruby_mvc/views/grid_table_view.rb
-- lib/ruby_mvc/views/table_view.rb
-- lib/ruby_mvc/views/view.rb
-- lib/ruby_mvc/views/web_content_table_view.rb
-- lib/ruby_mvc/views/web_content_view.rb
-- lib/ruby_mvc/views/web_model_view.rb
+- lib/ruby_mvc/toolkit/property_change_notifier.rb
+- lib/ruby_mvc/controllers/app_controller.rb
+- lib/ruby_mvc/controllers/action_provider.rb
+- lib/ruby_mvc/controllers/action_group.rb
+- lib/ruby_mvc/controllers/action.rb
+- lib/ruby_mvc/controllers/rails_controller.rb
+- lib/ruby_mvc/models/view_model_template.rb
+- lib/ruby_mvc/models/table_model.rb
+- lib/ruby_mvc/models/keyed_array_table_model.rb
+- lib/ruby_mvc/models/model.rb
+- lib/ruby_mvc/models/ar_row_model.rb
+- lib/ruby_mvc/models/ar_table_model.rb
+- lib/ruby_mvc/models/array_table_model.rb
+- lib/ruby_mvc/module.rb
+- lib/ruby_mvc/ar_support.rb
+- lib/ruby_mvc/controllers.rb
+- lib/ruby_mvc/renderers/html4_table_model_renderer.rb
+- lib/ruby_mvc/renderers/hyperlink_cell_renderer.rb
+- lib/ruby_mvc/application.rb
 - lib/ruby_mvc/views.rb
-- lib/ruby_mvc/wx.rb
+- lib/ruby_mvc/renderers.rb
 - lib/ruby_mvc.rb
-- sample/browser_view.rb
-- sample/form.rb
 - sample/form2.rb
-- sample/frame.rb
-- sample/grid_table_view.rb
+- sample/test2.html
 - sample/grid_view.rb
 - sample/grid_view2.rb
+- sample/form.rb
+- sample/frame.rb
+- sample/web_view.rb
 - sample/mvc.rb
+- sample/browser_view.rb
 - sample/test.html
-- sample/test2.html
-- sample/web_view.rb
+- sample/grid_table_view.rb
+- test/unit/models/test_model.rb
 - test/unit/models/test_array_table_model.rb
 - test/unit/models/test_keyed_array_table_model.rb
-- test/unit/models/test_model.rb
 - test/unit/test_array_table_model.rb
 - LICENSE
 - README.md