ruby_mvc 0.0.1 → 0.0.2

data/lib/ruby_mvc/views/grid_table_view.rb

@@ -0,0 +1,96 @@
+#--
+######################################################################
+#
+# 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_table_view.rb
+# Created:  Sun  1 Jan 2012 17:08:34 CET
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+module Views
+
+  # This class is used to provide a default binding between
+  # a table model instance and a GridView.
+
+  class GridTableView < PeerView
+    widget Toolkit::GridView
+
+    # This signal is triggered when the row edit action is
+    # triggered via either a double-click on the row or when
+    # either the toolbar or menu item is triggered.  Arguments
+    # are the sender view, the view model, the row index and
+    # the row model to be edited
+
+    signal "row-edit"
+
+    def initialize(model, options = {}, &block)
+      super(options, &block)
+
+      # initialize the default state of the peer widget
+      widget.model = model
+      widget.editable = options[:editable]
+
+      # Create the actions for the model
+      action(:new, :label => "New row", :icon => :stock_new) do
+        model.insert_rows(-1, model.create_rows)
+        idx = model.size - 1
+        signal_emit("row-edit", self, model, idx, model[idx])
+      end
+
+      action(:delete, 
+              :label => "Delete", 
+              :enable => :select_multi,
+              :icon => :stock_delete
+              ) do
+        puts "rows: #{widget.selected_rows.inspect}"
+        widget.selected_rows.reverse_each do |i|
+          model.remove_row(i)
+        end
+      end
+
+      action(:edit,
+              :label => "Edit...",
+              :enable => :select_single,
+              :icon => :stock_edit
+              ) do
+        idx = widget.selected_rows.first
+        row = model[idx]
+        signal_emit("row-edit", self, model, idx, row)
+      end
+
+      widget.signal_connect("row-selection-changed") do |s, m, rows|
+        puts "selection changed: #{rows.inspect}"
+        @actions.each do |a|
+          a.selection(s, m, rows)
+        end
+      end
+
+      widget.signal_connect("row-activated") do |s, m, r, k|
+        row = model[r]
+        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}"
+    end
+  end
+
+end
+end

data/lib/ruby_mvc/views/table_view.rb

@@ -26,11 +26,6 @@
 module RubyMVC
 module Views
 
-  # This class provides a basic TableView control based
-  # loosely on the Archistry JavaScript TreeGrid API.  It
-  # requires that the data to be displayed be supplied as a
-  # TableModel instance.
-
   class TableView < View
     def initialize(model, options = {}, &block)
       super(options, &block)
@@ -41,12 +36,6 @@ module Views
     # information in the table model.
 
     def load(model, options = {}, &block)
-      cols = columns(model, options)
-      defw = "#{100 / cols.size}%"
-      build_header(model, cols, defw, options)
-      stack(:width => "100%") do
-        model.each { |row| build_row(cols, row, defw) }
-      end
     end
 
   protected
@@ -62,34 +51,6 @@ module Views
         end
       end
     end
-
-    def build_header(model, cols, defw, options)
-      if options[:headers] != false
-        stack(:width => "100%") do
-          flow do
-            cols.each do |col|
-              flow(:width => defw) do
-                para col[:label], :weight => "bold", :align => "center"
-              end
-            end
-          end
-        end
-      end
-    end
-
-    def build_row(cols, row, defw)
-      flow do
-        cols.each do |col|
-          flow(:width => defw) do
-            if(r = col[:renderer])
-              r.render(self, row, col)
-            else
-              para row[col[:key]], col[:style]
-            end
-          end
-        end
-      end
-    end
   end
 
 end

data/lib/ruby_mvc/views/view.rb

@@ -0,0 +1,121 @@
+#--
+######################################################################
+#
+# 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:     view.rb
+# Created:  Sat 19 Nov 2011 11:28:08 GMT
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+  module Views
+   
+    class View < RubyMVC::Toolkit::AbstractWidget
+      attr_reader :actions
+      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
+      end
+    end
+
+    class PeerView < View
+      def self.widget_def(targ = nil)
+        if targ == nil
+          @widget_def
+        else
+          if (x = targ.widget_def).nil?
+            if targ != RubyMVC::Views::PeerView
+              self.widget_def(targ.superclass)
+            end
+          else
+            x
+          end
+        end
+      end
+
+      def self.create_widget(klass, options = {})
+        w = self.widget_def(klass)
+        args = (w[:args].clone << options)
+        block = w[:block]
+        args[0].new(*args[1..-1], &block)
+      end
+
+      class << self
+        # This method is used to define the primary widget
+        # class through which this view may be added to other
+        # widgets.
+
+        def widget(*args, &block)
+          puts "Set widget for #{self}: #{args.inspect}"
+          @widget_def = { :args => args, :block => block }
+        end
+      end
+
+      def peer
+        @widget.peer
+      end
+
+      # This method is used to retrieve a reference to the
+      # parent frame
+      attr_accessor :frame
+
+      attr_accessor :widget
+      def initialize(options = {})
+        super
+        @widget = PeerView.create_widget(self.class, options)
+      end
+
+      # This method is required to ensure that concrete views
+      # appropriately manage signal registration
+
+      def signal_connect(signal, &b)
+        puts "Widget class: #{@widget.class}"
+        if @widget.class.valid_signal? signal
+          @widget.signal_connect(signal, &b)
+        else
+         puts "super"
+          super
+        end
+      end
+
+      def signal_disconnect(signal, &b)
+        if @widget.class.valid_signal? signal
+          @widget.signal_connect(signal, &b)
+        else
+          super
+        end
+      end
+
+      def method_missing(m, *a, &b)
+        @widget.send(m, *a, &b)
+      end
+    end
+  end
+end

data/lib/ruby_mvc/views/web_content_table_view.rb

@@ -0,0 +1,40 @@
+#--
+######################################################################
+#
+# 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:     web_content_table_view.rb
+# Created:  Tue  3 Jan 2012 00:48:54 CET
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+module Views
+
+  # This is a WebContentView used to render table model
+  # instances as HTML
+
+  class WebContentTableView < WebContentView
+    def render
+      r = @options[:renderer] || Renderers::Html4TableModelRenderer
+      r.render(@model, @options)
+    end
+  end
+
+end
+end

data/lib/ruby_mvc/views/{web_view.rb → web_content_view.rb}

@@ -17,8 +17,8 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# File:     web_view.rb
-# Created:  Wed 23 Nov 2011 17:08:02 GMT
+# File:     web_content_view.rb
+# Created:  Tue  3 Jan 2012 00:41:51 CET
 #
 #####################################################################
 #++ 
@@ -26,38 +26,27 @@
 module RubyMVC
 module Views
 
-  # This is a more sophisticated view control vs. the standard
-  # toolkit widget.
+  # WebContentView instances are used to render models as web
+  # content to be displayed in either the Toolkit::WebView or
+  # the Views::BrowserView instances.
 
-  class WebView < View
-    widget Toolkit::WebView
+  class WebContentView < View
+    attr_reader :uri
 
-    # This method is used to load the view with the
-    # information in the table model.
+    def initialize(model, options = {})
+      super(options)
+      @model = model
+      @uri = options[:uri]
+    end
 
-    def load(model, options = {}, &block)
-      cols = columns(model, options)
-      if r = options[:renderer]
-        html = r.render(model, cols, options[:renderer_options])
-        puts "HTML:\n#{html}"
-        widget.load_html(html)
-      else
-        raise ArgumentError,"renderer not specified"
-      end
+    def render
     end
+  end
 
-  protected
-    # This method extracts or creates the column model for the
-    # view.
+  # This view is used to render a simple model instance
 
-    def columns(model, options)
-      if cols = options[:columns]
-        cols
-      else
-        cols = model.keys.collect do |k|
-          { :key => k.to_sym, :label => "#{k.capitalize}" }
-        end
-      end
+  class SimpleWebModelView < WebContentView
+    def render
     end
   end
 

data/lib/ruby_mvc/views/web_model_view.rb

@@ -0,0 +1,67 @@
+#--
+######################################################################
+#
+# 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:     ar_web_row_view.rb
+# Created:  Mon  9 Jan 2012 15:56:18 GMT
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+module Views
+
+  class WebModelView < WebContentView
+    include Tagz
+
+    def initialize(row, options = {})
+      if options.is_a? Hash
+        @template = options[:template]
+      else
+        @template = options
+        options = {}
+      end
+      super((@template ? @template.apply(row) : row), options)
+    end
+
+    def render
+      render_properties
+    end
+
+  protected
+    def render_properties
+      tagz {
+        table_(:border => 0, :cellspacing => 3) {
+          @model.labels.each do |l|
+            k = l[:key]
+            tr_ {
+              th_(:valign => "top", :align => "left") {
+                strong_ l[:label]
+              }
+              td_(:align => "top") {
+                @model[k]
+              }
+            }
+          end
+        }
+      }
+    end
+  end
+
+end
+end