ruby_mvc 0.0.1 → 0.0.2

data/lib/ruby_mvc/views/ar_support.rb

@@ -0,0 +1,29 @@
+#--
+######################################################################
+#
+# 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 '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'

data/lib/ruby_mvc/views/ar_type_editor.rb

@@ -26,36 +26,25 @@
 module RubyMVC
 module Views
 
-  class ActiveRecordTypeEditor < View
-    include RubyMVC::LinkDispatcher
-
-    def initialize(type, options = {}, &block)
-      ctrl = options[:controller] = options[:controller] || self
-      super(options, &block)
-      @type = type
-      @list = active_record_type_list type
-      para link("New...") {
-        ctrl.link_activated(self, "/create_instance")
-      }
-    end
-
-    def create_instance(sender, link)
-      debug("create instance of type #{@type}")
-      obj = @type.new
-      window do
-        stack do
-          obj.description = "Some text"
-          editor = active_record_model_editor obj
-          flow :margin_left => 0, :left => "-25%" do
-            button "Cancel", :align => "right" do 
-              close 
-            end
-            button "Save", :align => "right" do
-              editor.save
-              close
+  class ActiveRecordTypeEditor < GridTableView
+    def initialize(app, parent, entity_type, options = {}, &block)
+      options[:editable] = false
+      options[:show_row_labels] = false
+      @model = Models::ActiveRecordTableModel.new(entity_type)
+      @template = options[:template]
+      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)
+          form.signal_connect("form-submit") do |form, d|
+            begin
+              r.save!
+              m.update_row(i, r)
+            rescue ActiveRecord::RecordInvalid => e
+              app.error(e, :title => "Validation Error", :parent => dlg)
             end
-            debug("created buttons")
           end
+          dlg.add form
         end
       end
     end

data/lib/ruby_mvc/views/ar_web_model_view.rb

@@ -0,0 +1,59 @@
+#--
+######################################################################
+#
+# 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_model_view.rb
+# Created:  Mon  9 Jan 2012 22:45:05 GMT
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+module Views
+
+  class ActiveRecordWebModelView < WebModelView
+    signal "row-edit"
+    signal "row-delete", :vetoable => true
+
+    def initialize(row, options = {})
+      super
+
+      action(:edit, :label => "Edit", :icon => :stock_edit) do
+        signal_emit("row-edit", self, row)
+      end
+
+#      action(:delete, :label => "Delete", :icon => :stock_delete) do
+#        signal_emit("row-delete", self, row)
+#      end
+    end
+
+    def render
+      html = super
+      tagz {
+        tagz.concat html
+        tagz.concat render_links
+      }
+    end
+
+  protected
+    def render_links
+    end
+  end
+
+end
+end

data/lib/ruby_mvc/views/ar_web_type_list.rb

@@ -0,0 +1,44 @@
+#--
+######################################################################
+#
+# 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_type_list.rb
+# Created:  Mon  9 Jan 2012 15:56:18 GMT
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+module Views
+
+  class ActiveRecordWebTypeList < WebContentTableView
+    def initialize(entity_type, options = {}, &block)
+      @model = Models::ActiveRecordTableModel.new(entity_type)
+      if options.is_a? Hash
+        @template = options[:template]
+      else
+        @template = options
+        options = {}
+      end
+      super((@template ? @template.apply(@model) : @model), options)
+      action(:edit, :label => "Edit", :icon => :stock_edit, &block)
+    end
+  end
+
+end
+end

data/lib/ruby_mvc/views/browser_view.rb

@@ -0,0 +1,185 @@
+#--
+######################################################################
+#
+# 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:     browser_view.rb
+# Created:  Mon  2 Jan 2012 22:44:26 CET
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+module Views
+
+  # This class is slightly different at the moment as it
+  # really should have a HypermediaContentModel instance that
+  # feeds it vs. being explicitly driven by the client.  This
+  # should be addressed better in a future version.
+
+  class BrowserView < PeerView
+    widget Toolkit::WebView
+
+    def initialize(options = {}, &block)
+      super
+
+      class << action(:back,
+        :label => "Back", :icon => :stock_back, :widget => widget) do
+          go_back
+        end
+
+        def sensitive
+          x = @options[:widget].can_go_back?
+          property_changed(:sensitive, @sensitive, x)
+          @sensitive = x
+        end
+      end
+
+      class << action(:forward, 
+        :label => "Forward", :icon => :stock_forward, :widget => widget) do
+          go_forward
+        end
+
+        def sensitive
+          x = @options[:widget].can_go_forward?
+          property_changed(:sensitive, @sensitive, x)
+          @sensitive = x
+        end
+      end
+
+      class << action(:reload,
+        :label => "Reload", :icon => :stock_reload, :widget => widget) do
+          reload
+        end
+
+        def sensitive
+          w = @options[:widget]
+          x = (!w.location.nil? && "" != w.location)
+          property_changed(:sensitive, @sensitive, x)
+          @sensitive = x
+        end
+      end
+
+      widget.signal_connect("load-finished") do
+#        puts "load-finished #{widget.location}"
+        # FIXME: this is a hack, but it's the only way for now
+        @actions.each { |a| a.selection(self, nil, nil); a.sensitive }
+#        puts "back? #{widget.can_go_back?}"
+#        puts "forward? #{widget.can_go_forward?}"
+      end
+
+      widget.signal_connect("navigation-requested") do |s, h, t|
+        puts "BrowserView#navigation-requested: #{h}"
+        if (c = self.controller)
+          puts "forwarding to controller: #{c}"
+          c.link_activated(s, h)
+        end
+      end
+    end
+
+    def go_forward
+      reset_actions
+      widget.go_forward
+      append_actions((location || {})[:actions])
+    end
+
+    def go_back
+      reset_actions
+      widget.go_back
+      append_actions((location || {})[:actions])
+    end
+
+    def open(uri)
+      reset_actions
+      widget.open(uri)
+    end
+
+    def load_html(*args)
+      reset_actions
+#      puts "#load_html: " << args.inspect
+      widget.load_html(*args)
+    end
+
+    def reload
+      if location && v = location[:view]
+        load(v, location[:uri])
+      else
+        super
+      end
+    end
+
+    def append_html(*args, &block)
+      widget.append_html(*args, &block)
+    end
+
+    def load(view, uri = nil)
+      if !view.is_a? WebContentView
+        raise ArgumentError, "view must currently be a WebContentView instance"
+      end
+
+      # FIXME: need action support in the history management
+      # too so that actions are appropriately added/removed
+      # during forward/backward navigation requests
+
+      load_html(view.render, uri || view.uri)
+      widget.location[:view] = view
+
+      # If our view provides a different controller, then we
+      # need to defer link handling to that controller instead
+      # of ours (which probably wasn't defined in the first
+      # place)
+
+      if (vc = view.controller) && vc != self.controller
+        puts "assigned new controller from WebContentView: #{vc}"
+        self.controller = vc
+      else
+        puts "no controller defined for #{view}"
+      end
+
+      # add any content actions
+      append_actions(view.actions)
+    end
+
+    def add(view)
+      if !view.is_a? WebContentView
+        raise ArgumentError, "view must currently be a WebContentView instance"
+      end
+
+      append_html(view.render)
+
+# FIXME: this should really be done, but we need to be a bit
+# more sophisticated in the way we manage it
+#      append_actions(view.actions)
+    end
+
+  private
+    def append_actions(actions)
+      return if !actions
+
+      location[:actions] = actions if location
+      frame.merge_actions(actions)
+    end
+
+    def reset_actions
+      if location && (ca = location[:actions])
+        frame.unmerge_actions(ca)
+      end
+    end
+  end
+
+end
+end

data/lib/ruby_mvc/views/form_view.rb

@@ -0,0 +1,111 @@
+#--
+######################################################################
+#
+# 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_view.rb
+# Created:  Fri 30 Dec 2011 14:48:46 CET
+#
+#####################################################################
+#++ 
+
+module RubyMVC
+module Views
+
+  # FormView instances are an abstract representation of a
+  # form-based editor for model instances.  It is deliberately
+  # modelled on HTML forms where possible.
+
+  class FormView < View
+    # This signal is emitted by the hosting widget when the
+    # form has been submitted.  The block is passed arguments
+    # for the form and the model (or model proxy) being used.
+
+    signal "form-submit", :vetoable => true
+
+    # This signal is emitted by the hosting widget when the
+    # form has been reset.
+
+    signal "form-reset"
+
+    def initialize(model, &block)
+      @model = model
+      @editors = {}
+      @validators = {}
+      @disabled = {}
+      self.instance_eval(&block) if block
+    end
+
+    def editor(key, editor)
+      @editors[key.to_sym] = editor
+    end
+
+    # This method sets a validator block for the given key.
+    # More than one validator can be initialized for each
+    # property key
+
+    def validator(key, &block)
+      return if !block
+      vals = (@validators[key.to_sym] ||= [])
+      vals << block
+    end
+
+    # This method is used to ensure that the specified model
+    # key field appears, but is disabled.  This can also be
+    # done via the model by ensuring editable is false.
+
+    def disabled(key, val = true)
+      @disabled[key.to_sym] = val
+    end
+
+    # This method is used by the concrete hosting widget to
+    # iterate through the form field definitions so that it
+    # can create the actual UI form.
+
+    def layout(&block)
+      @model.labels.each do |l|
+        k = l[:key]
+        if (@disabled.has_key?(k) && @disabled[k]) \
+            || !@model.is_editable?(k)
+          disabled = true
+        else
+          disabled = false
+        end
+        block.call(k, l[:label], @model[k], @editors[k] || l[:editor], disabled)
+      end
+    end
+
+    # This method is called when the form should be saved to
+    # the underlying model.
+
+    def submit(values)
+      values.each do |k, v|
+        @model[k] = v if @model.is_editable? k
+      end
+      signal_emit("form-submit", self, @model)
+    end
+
+    def reset(&block)
+      @model.keys.each do |k|
+        block.call(k, @model[k])
+      end
+      signal_emit("form-reset", self, @model)
+    end
+  end
+
+end
+end